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

Commit ba0c7873 authored by Eun Jeong Shin's avatar Eun Jeong Shin Committed by Android (Google) Code Review
Browse files

Merge "Deprecate the DefaultPermissionGrantPolicy,... 

Merge "Deprecate the DefaultPermissionGrantPolicy, grantDefaultPermissionsToEnabledCarrierApps, that grants a set of location permissions including ACCESS_FINE_LOCATION, ACCESS_COARSE_LOCATION, ACCESS_BACKGROUND_LOCATION to carriers" into main
parents 6dff470b 0b223c70

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

+1 −0
Original line number Diff line number Diff line
@@ -1059,6 +1059,7 @@ final class DefaultPermissionGrantPolicy { 
        }

    }



    @Deprecated

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

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

        if (packageNames == null) {

services/core/java/com/android/server/pm/permission/LegacyPermissionManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -308,7 +308,7 @@ public class LegacyPermissionManagerService extends ILegacyPermissionManager.Stu 
                        userId));

    }



    @Override

    @Deprecated

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

        final int callingUid = Binder.getCallingUid();

        PackageManagerServiceUtils.enforceSystemOrPhoneCaller(