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

Commit 88dcc7b4 authored by Hai Zhang's avatar Hai Zhang
Browse files

Fix ensureSystemPackageName(). 

Use MATCH_FACTORY_ONLY and USER_SYSTEM.

Bug: 145981139
Test: presubmit
Change-Id: I659787d95432403b100af1fac986472bb7522876
parent 512f632f

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

+1 −3
Original line number Diff line number Diff line
@@ -19662,9 +19662,7 @@ public class PackageManagerService extends IPackageManager.Stub 
        if (packageName == null) {

            return null;

        }

        if (getPackageInfo(packageName, MATCH_SYSTEM_ONLY | MATCH_DIRECT_BOOT_AWARE

                        | MATCH_DIRECT_BOOT_UNAWARE | MATCH_DISABLED_COMPONENTS,

                UserHandle.getCallingUserId()) == null) {

        if (getPackageInfo(packageName, MATCH_FACTORY_ONLY, UserHandle.USER_SYSTEM) == null) {

            return null;

        }

        return packageName;