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

Commit 7b8eb856 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix ensureSystemPackageName()."

parents f7258237 88dcc7b4

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

+1 −3
Original line number Diff line number Diff line
@@ -19706,9 +19706,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;