From 256683e3a862d04d9148b08653599bdeb26643cc Mon Sep 17 00:00:00 2001 From: Peter Wang Date: Tue, 17 Mar 2020 17:36:14 -0700 Subject: [PATCH] [Telephony Mainline] Hide all PermissionManager APIs for R Bug: 142019744 Fix: 142019744 Test: Build Change-Id: Ic1e08757ccba510fac3636c5bae33e8da23b7e6b --- api/system-current.txt | 6 ------ core/java/android/permission/PermissionManager.java | 6 ------ 2 files changed, 12 deletions(-) diff --git a/api/system-current.txt b/api/system-current.txt index f4e2a936f603f..0b6a961c5b480 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -8902,12 +8902,6 @@ package android.permission { method @NonNull @RequiresPermission(android.Manifest.permission.ADJUST_RUNTIME_PERMISSIONS_POLICY) public java.util.Set getAutoRevokeExemptionRequestedPackages(); method @IntRange(from=0) @RequiresPermission(anyOf={android.Manifest.permission.ADJUST_RUNTIME_PERMISSIONS_POLICY, android.Manifest.permission.UPGRADE_RUNTIME_PERMISSIONS}) public int getRuntimePermissionsVersion(); method @NonNull public java.util.List 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); - 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); - method @RequiresPermission(android.Manifest.permission.GRANT_RUNTIME_PERMISSIONS_TO_TELEPHONY_DEFAULTS) public void grantDefaultPermissionsToEnabledTelephonyDataServices(@NonNull String[], @NonNull android.os.UserHandle, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer); - 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); - 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); - 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); method @RequiresPermission(anyOf={android.Manifest.permission.ADJUST_RUNTIME_PERMISSIONS_POLICY, android.Manifest.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); diff --git a/core/java/android/permission/PermissionManager.java b/core/java/android/permission/PermissionManager.java index 8308bb39d8c59..fc993b87a9786 100644 --- a/core/java/android/permission/PermissionManager.java +++ b/core/java/android/permission/PermissionManager.java @@ -177,7 +177,6 @@ public final class PermissionManager { * @param callback The callback provided by caller to be notified when grant completes * @hide */ - @SystemApi @RequiresPermission(Manifest.permission.GRANT_RUNTIME_PERMISSIONS_TO_TELEPHONY_DEFAULTS) public void grantDefaultPermissionsToLuiApp( @NonNull String packageName, @NonNull UserHandle user, @@ -199,7 +198,6 @@ public final class PermissionManager { * @param callback The callback provided by caller to be notified when grant completes * @hide */ - @SystemApi @RequiresPermission(Manifest.permission.GRANT_RUNTIME_PERMISSIONS_TO_TELEPHONY_DEFAULTS) public void revokeDefaultPermissionsFromLuiApps( @NonNull String[] packageNames, @NonNull UserHandle user, @@ -221,7 +219,6 @@ public final class PermissionManager { * @param callback The callback provided by caller to be notified when grant completes * @hide */ - @SystemApi @RequiresPermission(Manifest.permission.GRANT_RUNTIME_PERMISSIONS_TO_TELEPHONY_DEFAULTS) public void grantDefaultPermissionsToEnabledImsServices( @NonNull String[] packageNames, @NonNull UserHandle user, @@ -243,7 +240,6 @@ public final class PermissionManager { * @param callback The callback provided by caller to be notified when grant completes * @hide */ - @SystemApi @RequiresPermission(Manifest.permission.GRANT_RUNTIME_PERMISSIONS_TO_TELEPHONY_DEFAULTS) public void grantDefaultPermissionsToEnabledTelephonyDataServices( @NonNull String[] packageNames, @NonNull UserHandle user, @@ -265,7 +261,6 @@ public final class PermissionManager { * @param callback The callback provided by caller to be notified when revoke completes * @hide */ - @SystemApi @RequiresPermission(Manifest.permission.GRANT_RUNTIME_PERMISSIONS_TO_TELEPHONY_DEFAULTS) public void revokeDefaultPermissionsFromDisabledTelephonyDataServices( @NonNull String[] packageNames, @NonNull UserHandle user, @@ -287,7 +282,6 @@ public final class PermissionManager { * @param callback The callback provided by caller to be notified when grant completes * @hide */ - @SystemApi @RequiresPermission(Manifest.permission.GRANT_RUNTIME_PERMISSIONS_TO_TELEPHONY_DEFAULTS) public void grantDefaultPermissionsToEnabledCarrierApps(@NonNull String[] packageNames, @NonNull UserHandle user, @NonNull @CallbackExecutor Executor executor,