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

Commit 3aaf673c authored by Brad Ebinger's avatar Brad Ebinger Committed by android-build-merger
Browse files

Merge "Adds @hide permission granting API for ImsServices" am: 390ec27f am: 6734275c 

am: fa1dca0a

Change-Id: Id2875b5b60401405e31e76eb07968798144df700
parents da5289b6 fa1dca0a

core/java/android/content/pm/IPackageManager.aidl

+1 −0
Original line number Diff line number Diff line
@@ -563,6 +563,7 @@ interface IPackageManager { 
    void addOnPermissionsChangeListener(in IOnPermissionsChangeListener listener);

    void removeOnPermissionsChangeListener(in IOnPermissionsChangeListener listener);

    void grantDefaultPermissionsToEnabledCarrierApps(in String[] packageNames, int userId);

    void grantDefaultPermissionsToEnabledImsServices(in String[] packageNames, int userId);



    boolean isPermissionRevokedByPolicy(String permission, String packageName, int userId);

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

+17 −0
Original line number Diff line number Diff line
@@ -777,6 +777,23 @@ final class DefaultPermissionGrantPolicy { 
        }

    }



    public void grantDefaultPermissionsToEnabledImsServicesLPr(String[] packageNames, int userId) {

        Log.i(TAG, "Granting permissions to enabled ImsServices for user:" + userId);

        if (packageNames == null) {

            return;

        }

        for (String packageName : packageNames) {

            PackageParser.Package imsServicePackage = getSystemPackageLPr(packageName);

            if (imsServicePackage != null

                    && doesPackageSupportRuntimePermissions(imsServicePackage)) {

                grantRuntimePermissionsLPw(imsServicePackage, PHONE_PERMISSIONS, userId);

                grantRuntimePermissionsLPw(imsServicePackage, MICROPHONE_PERMISSIONS, userId);

                grantRuntimePermissionsLPw(imsServicePackage, LOCATION_PERMISSIONS, userId);

                grantRuntimePermissionsLPw(imsServicePackage, CAMERA_PERMISSIONS, userId);

            }

        }

    }



    public void grantDefaultPermissionsToDefaultBrowserLPr(String packageName, int userId) {

        Log.i(TAG, "Granting permissions to default browser for user:" + userId);

        if (packageName == null) {

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

+14 −0
Original line number Diff line number Diff line
@@ -21204,6 +21204,20 @@ Slog.v(TAG, ":: stepped forward, applying functor at tag " + parser.getName()); 
        }

    }













    @Override













    public void grantDefaultPermissionsToEnabledImsServices(String[] packageNames, int userId) {













        enforceSystemOrPhoneCaller("grantDefaultPermissionsToEnabledImsServices");













        synchronized (mPackages) {













            final long identity = Binder.clearCallingIdentity();













            try {













                mDefaultPermissionPolicy.grantDefaultPermissionsToEnabledImsServicesLPr(













                        packageNames, userId);













            } finally {













                Binder.restoreCallingIdentity(identity);













            }













        }













    }



























    private static void enforceSystemOrPhoneCaller(String tag) {















        int callingUid = Binder.getCallingUid();















        if (callingUid != Process.PHONE_UID && callingUid != Process.SYSTEM_UID) {