commit 7b221efa5366da64c0396891944ead52fb21db3a
author Sunny Goyal <sunnygoyal@google.com> Thu Sep 17 14:09:07 2015 -0700
committer Sunny Goyal <sunnygoyal@google.com> Thu Sep 17 14:09:27 2015 -0700
tree 18057d40fa63b8b79364fe0bfa6bbbab4263d86c
parent 3dc7beea3c7f9a60070e767aa43f5877a467d3ed

Null check when getting list of widget receivers

Bug: 23897605
Change-Id: Ib23b394828b0e5ec50bf7452b2ec2c905f4a6fbc

src/com/android/launcher3/LauncherModel.java

diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index 9817f3f..34edf77 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) {
                             // Ignore the crash. We can live with a state widget list.
                             Log.e(TAG, "PM call failed for " + pkg, e);