From c83157f0f55b1c3733be26db07e4e4f525fb083b Mon Sep 17 00:00:00 2001 From: cretin45 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(-) diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java index 36d4877fb..83b5d8209 100644 --- a/src/com/android/launcher3/LauncherModel.java +++ b/src/com/android/launcher3/LauncherModel.java @@ -3513,9 +3513,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 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