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

Merge "NPE fix causing test flakiness." into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-04-22 22:08:43 +00:00
committed by Android (Google) Code Review
parent 283be9f7b7 b23c00f39d
commit 04a8969e4e
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -20826,8 +20826,11 @@ public class PackageManagerService extends IPackageManager.Stub
final int[] instantUserIds = isInstantApp ? new int[] { userId } : EMPTY_INT_ARRAY; final int[] instantUserIds = isInstantApp ? new int[] { userId } : EMPTY_INT_ARRAY;
final SparseArray<int[]> broadcastWhitelist; final SparseArray<int[]> broadcastWhitelist;
synchronized (mLock) { synchronized (mLock) {
broadcastWhitelist = isInstantApp ? null : mAppsFilter.getVisibilityWhitelist( PackageSetting setting = getPackageSettingInternal(packageName, Process.SYSTEM_UID);
getPackageSettingInternal(packageName, Process.SYSTEM_UID), if (setting == null) {
return;
}
broadcastWhitelist = isInstantApp ? null : mAppsFilter.getVisibilityWhitelist(setting,
userIds, mSettings.mPackages); userIds, mSettings.mPackages);
} }
sendPackageBroadcast(Intent.ACTION_PACKAGE_CHANGED, packageName, extras, flags, null, null, sendPackageBroadcast(Intent.ACTION_PACKAGE_CHANGED, packageName, extras, flags, null, null,