diff options
| author | 2020-04-21 18:26:10 -0700 | |
|---|---|---|
| committer | 2020-04-22 10:00:04 -0700 | |
| commit | b23c00f39dba590313af150480317240032eb73c (patch) | |
| tree | 655b29467796939ecac2c68328232bfdbb518031 | |
| parent | d29a2ccceda3a4e837dbc1c8198507475191001a (diff) | |
NPE fix causing test flakiness.
Bug: b/151715802
Test: atest AppEnumerationTests PackageManagerTest PackageManagerShellCommandTest PackageManagerShellCommandIncrementalTest IncrementalServiceTest
Change-Id: Ifd72a34ff36ae918a43a9c5b1b2c74726eb09c00
| -rw-r--r-- | services/core/java/com/android/server/pm/PackageManagerService.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 9f543b414254..04d583ab72e1 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -20825,8 +20825,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, |