commit f4885bf28f60099a91a75a1580ce21cf88d3c972
author Peter Wang <tpwang@google.com> Thu Mar 19 19:21:21 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 19 19:21:21 2020 +0000
tree 06ae56ebbb1e9bc473e4e4144ba340c5e38028c0
parent 2f83e15e1870392a4cdec60275fc740917690799
parent 256683e3a862d04d9148b08653599bdeb26643cc

Merge "[Telephony Mainline] Hide all PermissionManager APIs for R" into rvc-dev

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index e5647f9..b66c704 100755
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -8897,12 +8897,6 @@
     method @NonNull @RequiresPermission(android.Manifest.permission.ADJUST_RUNTIME_PERMISSIONS_POLICY) public java.util.Set<java.lang.String> 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<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>);
-    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<java.lang.Boolean>);
-    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(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);

core/java/android/permission/PermissionManager.java

diff --git a/core/java/android/permission/PermissionManager.java b/core/java/android/permission/PermissionManager.java
index 8308bb3..fc993b8 100644
--- a/core/java/android/permission/PermissionManager.java
+++ b/core/java/android/permission/PermissionManager.java
@@ -177,7 +177,6 @@
      * @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 @@
      * @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 @@
      * @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 @@
      * @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 @@
      * @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 @@
      * @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,