commit b2983510230f49616b81be363707928e526d30a4
author Bjorn Bringert <bringert@android.com> Thu Feb 11 02:00:24 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 11 02:00:24 2010 -0800
tree a4583d3b6692215b78efb605d029f107d064e7bd
parent 49ffc0ff72a29f000b56deb34b0706cbfc5624bf
parent 5f85780db058d3babb435466b33834c3cc70f5c1

Merge "Fix NPE in AppWidgetService.addProvidersForPackageLocked()"

services/java/com/android/server/AppWidgetService.java

diff --git a/services/java/com/android/server/AppWidgetService.java b/services/java/com/android/server/AppWidgetService.java
index f336d1f..0b466f1 100644
--- a/services/java/com/android/server/AppWidgetService.java
+++ b/services/java/com/android/server/AppWidgetService.java
@@ -573,7 +573,7 @@
         List<ResolveInfo> broadcastReceivers = pm.queryBroadcastReceivers(intent,
                 PackageManager.GET_META_DATA);
 
-        final int N = broadcastReceivers.size();
+        final int N = broadcastReceivers == null ? 0 : broadcastReceivers.size();
         for (int i=0; i<N; i++) {
             ResolveInfo ri = broadcastReceivers.get(i);
             addProviderLocked(ri);
@@ -1137,7 +1137,7 @@
         List<ResolveInfo> broadcastReceivers = mPackageManager.queryBroadcastReceivers(intent,
                 PackageManager.GET_META_DATA);
 
-        final int N = broadcastReceivers.size();
+        final int N = broadcastReceivers == null ? 0 : broadcastReceivers.size();
         for (int i=0; i<N; i++) {
             ResolveInfo ri = broadcastReceivers.get(i);
             ActivityInfo ai = ri.activityInfo;
@@ -1156,7 +1156,7 @@
                 PackageManager.GET_META_DATA);
 
         // add the missing ones and collect which ones to keep
-        int N = broadcastReceivers.size();
+        int N = broadcastReceivers == null ? 0 : broadcastReceivers.size();
         for (int i=0; i<N; i++) {
             ResolveInfo ri = broadcastReceivers.get(i);
             ActivityInfo ai = ri.activityInfo;