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

Commit f4885bf2 authored by Peter Wang's avatar Peter Wang Committed by Android (Google) Code Review
Browse files

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

parents 2f83e15e 256683e3

api/system-current.txt

+0 −6
Original line number Diff line number Diff line
@@ -8897,12 +8897,6 @@ package android.permission { 
    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

+0 −6
Original line number Diff line number Diff line
@@ -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,