commit 0f196e6939ee9f23ea24d046e74fd1d1d3fc953f
author Sunny Goyal <sunnygoyal@google.com> Thu Sep 17 21:52:13 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 17 21:52:13 2015 +0000
tree 24b034680f7a02927a56307d2e1b6334245b72ff
parent 79afe010d55af6b1753430a334bf6e24448e9375
parent 7b221efa5366da64c0396891944ead52fb21db3a

Merge "Null check when getting list of widget receivers" into ub-launcher3-burnaby

src/com/android/launcher3/LauncherModel.java

diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index 95a4c46..598b8ce 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -3307,9 +3307,10 @@
                     PackageManager pm = context.getPackageManager();
                     for (String pkg : mPackages) {
                         try {
-                            needToRefresh |= !pm.queryBroadcastReceivers(
+                            List<ResolveInfo> widgets = pm.queryBroadcastReceivers(
                                     new Intent(AppWidgetManager.ACTION_APPWIDGET_UPDATE)
-                                            .setPackage(pkg), 0).isEmpty();
+                                            .setPackage(pkg), 0);
+                            needToRefresh |= widgets != null && !widgets.isEmpty();
                         } catch (RuntimeException e) {
                             if (LauncherAppState.isDogfoodBuild()) {
                                 throw e;