diff options
| author | Bjorn Bringert <bringert@android.com> | 2010-02-10 23:09:48 +0000 |
|---|---|---|
| committer | Bjorn Bringert <bringert@android.com> | 2010-02-10 23:09:48 +0000 |
| commit | 5f85780db058d3babb435466b33834c3cc70f5c1 (patch) | |
| tree | 5e3aaeb217085b8eeec5a0b9299ffd784c158a9a /services/java/com/android/server/AppWidgetService.java | |
| parent | e4e82f2782e61658256ecb85066e273c22a37951 (diff) | |
| download | frameworks_base-5f85780db058d3babb435466b33834c3cc70f5c1.zip frameworks_base-5f85780db058d3babb435466b33834c3cc70f5c1.tar.gz frameworks_base-5f85780db058d3babb435466b33834c3cc70f5c1.tar.bz2 | |
Fix NPE in AppWidgetService.addProvidersForPackageLocked()
queryBroadcastReceivers() can return null, so AppWidgetService
should guard against that.
Fixes http://b/issue?id=2418982
Change-Id: I1ba83c0c37622e0280f3dba2fef5eca2cc90c975
Diffstat (limited to 'services/java/com/android/server/AppWidgetService.java')
| -rw-r--r-- | services/java/com/android/server/AppWidgetService.java | 6 |
1 files changed, 3 insertions, 3 deletions
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 @@ class AppWidgetService extends IAppWidgetService.Stub 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 @@ class AppWidgetService extends IAppWidgetService.Stub 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 @@ class AppWidgetService extends IAppWidgetService.Stub 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; |