diff options
| author | cretin45 <cretin45@gmail.com> | 2016-03-08 15:47:45 -0800 |
|---|---|---|
| committer | Ed Carrigan <cretin45@gmail.com> | 2016-03-08 15:56:52 -0800 |
| commit | f254c636c720768df2856c693ef43b9c4a5816f7 (patch) | |
| tree | fe999bf8f13c2816b3cd1c121aa2187244ced91d | |
| parent | 21e6f1e715a9a3012b77ba4b45cf0c5b09fe9439 (diff) | |
| download | android_packages_apps_Trebuchet-f254c636c720768df2856c693ef43b9c4a5816f7.tar.gz android_packages_apps_Trebuchet-f254c636c720768df2856c693ef43b9c4a5816f7.tar.bz2 android_packages_apps_Trebuchet-f254c636c720768df2856c693ef43b9c4a5816f7.zip | |
Trebuchet: Guard against NPE while querying for widget updates
Issue-id: CYNGNOS-1867
Change-Id: I43db0096da5f35bd2810f8793d8281607afea1ff
(cherry picked from commit e48ef94fd67a228c3ab402bdbb2b77c8a5440012)
| -rw-r--r-- | src/com/android/launcher3/LauncherModel.java | 7 |
1 files changed, 5 insertions, 2 deletions
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(); + } } } |