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

Commit b23c00f3 authored by Alex Buynytskyy's avatar Alex Buynytskyy
Browse files

NPE fix causing test flakiness. 

Bug: b/151715802
Test: atest AppEnumerationTests PackageManagerTest PackageManagerShellCommandTest PackageManagerShellCommandIncrementalTest IncrementalServiceTest
Change-Id: Ifd72a34ff36ae918a43a9c5b1b2c74726eb09c00
parent d29a2ccc

services/core/java/com/android/server/pm/PackageManagerService.java

+5 −2
Original line number Diff line number Diff line
@@ -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,