commit 52f6709931ecfb4e63929c325d2c66cf4b0017bc
author Hyunyoung Song <hyunyoungs@google.com> Thu Jun 18 12:59:51 2015 -0700
committer The Android Automerger <android-build@google.com> Thu Jun 18 16:11:50 2015 -0700
tree 7ca633c88ce4d3890fbd3b287279323f571eb8f4
parent 2454e76513e4bbc116a2eee7a3200d660053038b

GetInstalledProvidersForProfiles should never return null object.

b/21916365
b/19904873

Change-Id: I296cafd15a185ad91cb7491bd6d2466ac03cdfb7

services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java

diff --git a/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java b/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java
index b737de3..30680ed 100644
--- a/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java
+++ b/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java
@@ -1298,7 +1298,7 @@
         synchronized (mLock) {
             ensureGroupStateLoadedLocked(userId);
 
-            ArrayList<AppWidgetProviderInfo> result = null;
+            ArrayList<AppWidgetProviderInfo> result = new ArrayList<AppWidgetProviderInfo>();
 
             final int providerCount = mProviders.size();
             for (int i = 0; i < providerCount; i++) {
@@ -1315,9 +1315,6 @@
                 if (providerProfileId == profileId
                         && mSecurityPolicy.isProviderInCallerOrInProfileAndWhitelListed(
                             provider.id.componentName.getPackageName(), providerProfileId)) {
-                    if (result == null) {
-                        result = new ArrayList<>();
-                    }
                     result.add(cloneIfLocalBinder(info));
                 }
             }