Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "GetInstalledProvidersForProfiles should never return null object." into mnc-dev

Browse Source
This commit is contained in:
Hyunyoung Song
2015-06-18 20:13:34 +00:00
committed by Android (Google) Code Review
parent 7105fd43d2 c070bab9ed
commit 71b4425982
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java
View File

@@ -1298,7 +1298,7 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku
synchronized (mLock) { synchronized (mLock) {
ensureGroupStateLoadedLocked(userId); ensureGroupStateLoadedLocked(userId);
ArrayList<AppWidgetProviderInfo> result = null; ArrayList<AppWidgetProviderInfo> result = new ArrayList<AppWidgetProviderInfo>();
final int providerCount = mProviders.size(); final int providerCount = mProviders.size();
for (int i = 0; i < providerCount; i++) { for (int i = 0; i < providerCount; i++) {
@@ -1315,9 +1315,6 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku
if (providerProfileId == profileId if (providerProfileId == profileId
&& mSecurityPolicy.isProviderInCallerOrInProfileAndWhitelListed( && mSecurityPolicy.isProviderInCallerOrInProfileAndWhitelListed(
provider.id.componentName.getPackageName(), providerProfileId)) { provider.id.componentName.getPackageName(), providerProfileId)) {
if (result == null) {
result = new ArrayList<>();
}
result.add(cloneIfLocalBinder(info)); result.add(cloneIfLocalBinder(info));
} }
} }