commit 05247be8aa0aa9b9369ac7f86392933dd8bd8dd1
author Sunny Goyal <sunnygoyal@google.com> Thu Sep 17 22:03:56 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 17 22:03:56 2015 +0000
tree cedbd7f32db034c8724036de15da97d51fb43f1a
parent a3c657750a1a3abae424e467f651e6431a6e19c2
parent 0f196e6939ee9f23ea24d046e74fd1d1d3fc953f

am 0f196e69: Merge "Null check when getting list of widget receivers" into ub-launcher3-burnaby

* commit '0f196e6939ee9f23ea24d046e74fd1d1d3fc953f':
  Null check when getting list of widget receivers

src/com/android/launcher3/LauncherModel.java

diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index 82238d5..df803e5 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -3303,9 +3303,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;