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

Commit 8714427b authored by Hai Zhang's avatar Hai Zhang
Browse files

Add UPGRADE_RUNTIME_PERMISSIONS permission to support testing. 

Bug: 136503238
Test: presubmit
Change-Id: I3f3b60e3c2cf04195efcf9233016eae103c74d7e
parent be1592ef

api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -9174,7 +9174,7 @@ package android.permission { 
  }















  public final class PermissionManager {













    method @IntRange(from=0) @RequiresPermission(android.Manifest.permission.ADJUST_RUNTIME_PERMISSIONS_POLICY) public int getRuntimePermissionsVersion();













    method @IntRange(from=0) @RequiresPermission(anyOf={android.Manifest.permission.ADJUST_RUNTIME_PERMISSIONS_POLICY, "android.permission.UPGRADE_RUNTIME_PERMISSIONS"}) public int getRuntimePermissionsVersion();















    method @NonNull public java.util.List<android.permission.PermissionManager.SplitPermissionInfo> getSplitPermissions();















    method @RequiresPermission(android.Manifest.permission.GRANT_RUNTIME_PERMISSIONS_TO_TELEPHONY_DEFAULTS) public void grantDefaultPermissionsToEnabledCarrierApps(@NonNull String[], @NonNull android.os.UserHandle, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Boolean>);















    method @RequiresPermission(android.Manifest.permission.GRANT_RUNTIME_PERMISSIONS_TO_TELEPHONY_DEFAULTS) public void grantDefaultPermissionsToEnabledImsServices(@NonNull String[], @NonNull android.os.UserHandle, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Boolean>);









@@ -9182,7 +9182,7 @@ package android.permission {













    method @RequiresPermission(android.Manifest.permission.GRANT_RUNTIME_PERMISSIONS_TO_TELEPHONY_DEFAULTS) public void grantDefaultPermissionsToLuiApp(@NonNull String, @NonNull android.os.UserHandle, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Boolean>);















    method @RequiresPermission(android.Manifest.permission.GRANT_RUNTIME_PERMISSIONS_TO_TELEPHONY_DEFAULTS) public void revokeDefaultPermissionsFromDisabledTelephonyDataServices(@NonNull String[], @NonNull android.os.UserHandle, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Boolean>);















    method @RequiresPermission(android.Manifest.permission.GRANT_RUNTIME_PERMISSIONS_TO_TELEPHONY_DEFAULTS) public void revokeDefaultPermissionsFromLuiApps(@NonNull String[], @NonNull android.os.UserHandle, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Boolean>);













    method @RequiresPermission(android.Manifest.permission.ADJUST_RUNTIME_PERMISSIONS_POLICY) public void setRuntimePermissionsVersion(@IntRange(from=0) int);













    method @RequiresPermission(anyOf={android.Manifest.permission.ADJUST_RUNTIME_PERMISSIONS_POLICY, "android.permission.UPGRADE_RUNTIME_PERMISSIONS"}) public void setRuntimePermissionsVersion(@IntRange(from=0) int);















    method @RequiresPermission(android.Manifest.permission.MANAGE_ONE_TIME_PERMISSION_SESSIONS) public void startOneTimePermissionSession(@NonNull String, long, int, int);















    method @RequiresPermission(android.Manifest.permission.MANAGE_ONE_TIME_PERMISSION_SESSIONS) public void stopOneTimePermissionSession(@NonNull String);















  }

























api/test-current.txt



+2
−2




























Original line number
Diff line number
Diff line








@@ -2662,9 +2662,9 @@ package android.permission {













  }































  public final class PermissionManager {













    method @IntRange(from=0) @RequiresPermission("android.permission.ADJUST_RUNTIME_PERMISSIONS_POLICY") public int getRuntimePermissionsVersion();













    method @IntRange(from=0) @RequiresPermission(anyOf={"android.permission.ADJUST_RUNTIME_PERMISSIONS_POLICY", "android.permission.UPGRADE_RUNTIME_PERMISSIONS"}) public int getRuntimePermissionsVersion();















    method @NonNull public java.util.List<android.permission.PermissionManager.SplitPermissionInfo> getSplitPermissions();













    method @RequiresPermission("android.permission.ADJUST_RUNTIME_PERMISSIONS_POLICY") public void setRuntimePermissionsVersion(@IntRange(from=0) int);













    method @RequiresPermission(anyOf={"android.permission.ADJUST_RUNTIME_PERMISSIONS_POLICY", "android.permission.UPGRADE_RUNTIME_PERMISSIONS"}) public void setRuntimePermissionsVersion(@IntRange(from=0) int);















  }































  public static final class PermissionManager.SplitPermissionInfo {

































core/java/android/permission/PermissionManager.java



+8
−2




























Original line number
Diff line number
Diff line








@@ -93,7 +93,10 @@ public final class PermissionManager {













     */















    @TestApi















    @SystemApi













    @RequiresPermission(Manifest.permission.ADJUST_RUNTIME_PERMISSIONS_POLICY)













    @RequiresPermission(anyOf = {













            Manifest.permission.ADJUST_RUNTIME_PERMISSIONS_POLICY,













            Manifest.permission.UPGRADE_RUNTIME_PERMISSIONS













    })















    public @IntRange(from = 0) int getRuntimePermissionsVersion() {















        try {















            return mPackageManager.getRuntimePermissionsVersion(mContext.getUserId());









@@ -111,7 +114,10 @@ public final class PermissionManager {













     */















    @TestApi















    @SystemApi













    @RequiresPermission(Manifest.permission.ADJUST_RUNTIME_PERMISSIONS_POLICY)













    @RequiresPermission(anyOf = {













            Manifest.permission.ADJUST_RUNTIME_PERMISSIONS_POLICY,













            Manifest.permission.UPGRADE_RUNTIME_PERMISSIONS













    })















    public void setRuntimePermissionsVersion(@IntRange(from = 0) int version) {















        try {















            mPackageManager.setRuntimePermissionsVersion(version, mContext.getUserId());

































core/res/AndroidManifest.xml



+4
−0




























Original line number
Diff line number
Diff line








@@ -3670,6 +3670,10 @@













    <permission android:name="android.permission.ADJUST_RUNTIME_PERMISSIONS_POLICY"















                android:protectionLevel="signature|installer" />





























    <!-- @hide Allows an application to upgrade runtime permissions. -->













    <permission android:name="android.permission.UPGRADE_RUNTIME_PERMISSIONS"













                android:protectionLevel="signature" />





























    <!-- @SystemApi Allows an application to whitelist restricted permissions















         on any of the whitelists.















    @hide -->

































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



+17
−5




























Original line number
Diff line number
Diff line








@@ -23821,9 +23821,8 @@ public class PackageManagerService extends IPackageManager.Stub













    @Override















    public int getRuntimePermissionsVersion(@UserIdInt int userId) {















        Preconditions.checkArgumentNonnegative(userId);













        mContext.enforceCallingOrSelfPermission(













                Manifest.permission.ADJUST_RUNTIME_PERMISSIONS_POLICY,













                "setRuntimePermissionVersion");













        enforceAdjustRuntimePermissionsPolicyOrUpgradeRuntimePermissions(













                "getRuntimePermissionVersion");















        synchronized (mLock) {















            return mSettings.getDefaultRuntimePermissionsVersionLPr(userId);















        }









@@ -23833,14 +23832,27 @@ public class PackageManagerService extends IPackageManager.Stub













    public void setRuntimePermissionsVersion(int version, @UserIdInt int userId) {















        Preconditions.checkArgumentNonnegative(version);















        Preconditions.checkArgumentNonnegative(userId);













        mContext.enforceCallingOrSelfPermission(













                Manifest.permission.ADJUST_RUNTIME_PERMISSIONS_POLICY,













        enforceAdjustRuntimePermissionsPolicyOrUpgradeRuntimePermissions(















                "setRuntimePermissionVersion");















        synchronized (mLock) {















            mSettings.setDefaultRuntimePermissionsVersionLPr(version, userId);















        }















    }



























    private void enforceAdjustRuntimePermissionsPolicyOrUpgradeRuntimePermissions(













            @NonNull String message) {













        if (mContext.checkCallingOrSelfPermission(













                Manifest.permission.ADJUST_RUNTIME_PERMISSIONS_POLICY)













                != PackageManager.PERMISSION_GRANTED













                && mContext.checkCallingOrSelfPermission(













                Manifest.permission.UPGRADE_RUNTIME_PERMISSIONS)













                != PackageManager.PERMISSION_GRANTED) {













            throw new SecurityException(message + " requires "













                    + Manifest.permission.ADJUST_RUNTIME_PERMISSIONS_POLICY + " or "













                    + Manifest.permission.UPGRADE_RUNTIME_PERMISSIONS);













        }













    }



























    @Nullable















    public PackageSetting getPackageSetting(String packageName) {















        synchronized (mLock) {