Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 847bcd3a authored by Hyunyoung Song's avatar Hyunyoung Song Committed by Android Git Automerger
Browse files

am 71b44259: Merge "GetInstalledProvidersForProfiles should never return null object." into mnc-dev 

* commit '71b44259':
  GetInstalledProvidersForProfiles should never return null object.
parents 10161add 71b44259

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

+1 −4
Original line number Diff line number Diff line
@@ -1298,7 +1298,7 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku 
        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 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku 
                if (providerProfileId == profileId

                        && mSecurityPolicy.isProviderInCallerOrInProfileAndWhitelListed(

                            provider.id.componentName.getPackageName(), providerProfileId)) {

                    if (result == null) {

                        result = new ArrayList<>();

                    }

                    result.add(cloneIfLocalBinder(info));

                }

            }