From e48ef94fd67a228c3ab402bdbb2b77c8a5440012 Mon Sep 17 00:00:00 2001
From: cretin45 <cretin45@gmail.com>
Date: Tue, 8 Mar 2016 15:47:45 -0800
Subject: Trebuchet: Guard against NPE while querying for widget updates

Issue-id: CYNGNOS-1867

Change-Id: I43db0096da5f35bd2810f8793d8281607afea1ff
---
 src/com/android/launcher3/LauncherModel.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index f8f539016..e90ea1765 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -3585,9 +3585,12 @@ public class LauncherModel extends BroadcastReceiver
                     // Refresh widget list, if there is any newly added widget
                     PackageManager pm = context.getPackageManager();
                     for (String pkg : mPackages) {
-                        needToRefresh |= !pm.queryBroadcastReceivers(
+                        List<ResolveInfo> resolveInfos = pm.queryBroadcastReceivers(
                                 new Intent(AppWidgetManager.ACTION_APPWIDGET_UPDATE)
-                                    .setPackage(pkg), 0).isEmpty();
+                                        .setPackage(pkg), 0);
+                        if (resolveInfos != null) {
+                            needToRefresh |= !resolveInfos.isEmpty();
+                        }
                     }
                 }
 
-- 
cgit v1.2.3