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

Commit 00e7aae9 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

Change-Id: I149a0b3f78172734772be0c716bc5a41a0894c04
parents 0473179f 04a8969e

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

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