Merge "NPE fix causing test flakiness." into rvc-dev am: 04a8969e4e

Change-Id: I149a0b3f78172734772be0c716bc5a41a0894c04
This commit is contained in:
TreeHugger Robot
2020-04-22 22:20:56 +00:00
committed by Automerger Merge Worker

View File

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