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

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

Merge "PermissionController is now part of the core system."

parents 32a7fd78 556893ca
Loading
Loading
Loading
Loading
+3 −2
Original line number Diff line number Diff line
@@ -3046,7 +3046,6 @@ public class PackageManagerService extends IPackageManager.Stub
                mSharedSystemSharedLibraryPackageName = getRequiredSharedLibraryLPr(
                        PackageManager.SYSTEM_SHARED_LIBRARY_SHARED,
                        SharedLibraryInfo.VERSION_UNDEFINED);
                mRequiredPermissionControllerPackage = getRequiredPermissionControllerLPr();
            } else {
                mRequiredVerifierPackage = null;
                mRequiredInstallerPackage = null;
@@ -3055,8 +3054,10 @@ public class PackageManagerService extends IPackageManager.Stub
                mIntentFilterVerifier = null;
                mServicesSystemSharedLibraryPackageName = null;
                mSharedSystemSharedLibraryPackageName = null;
                mRequiredPermissionControllerPackage = null;
            }
            // PermissionController hosts default permission granting and role management, so it's a
            // critical part of the core system.
            mRequiredPermissionControllerPackage = getRequiredPermissionControllerLPr();
            // Initialize InstantAppRegistry's Instant App list for all users.
            final int[] userIds = UserManagerService.getInstance().getUserIds();