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

Commit 0bf20e17 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Allow tests for more PermissionControllerManager methods" into rvc-dev am: bac5755d 

Change-Id: I5407a8e41ebbce8cbacf84694295f0c0fc6f73ef
parents e61c4a03 bac5755d

api/test-current.txt

+6 −0
Original line number Diff line number Diff line
@@ -2889,8 +2889,10 @@ package android.permission { 


  public final class PermissionControllerManager {

    method @RequiresPermission(anyOf={"android.permission.GRANT_RUNTIME_PERMISSIONS", "android.permission.RESTORE_RUNTIME_PERMISSIONS"}) public void applyStagedRuntimePermissionBackup(@NonNull String, @NonNull android.os.UserHandle, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Boolean>);

    method @RequiresPermission("android.permission.GET_RUNTIME_PERMISSIONS") public void countPermissionApps(@NonNull java.util.List<java.lang.String>, int, @NonNull android.permission.PermissionControllerManager.OnCountPermissionAppsResultCallback, @Nullable android.os.Handler);

    method @RequiresPermission("android.permission.GET_RUNTIME_PERMISSIONS") public void getAppPermissions(@NonNull String, @NonNull android.permission.PermissionControllerManager.OnGetAppPermissionResultCallback, @Nullable android.os.Handler);

    method @RequiresPermission("android.permission.GET_RUNTIME_PERMISSIONS") public void getRuntimePermissionBackup(@NonNull android.os.UserHandle, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<byte[]>);

    method @RequiresPermission("android.permission.REVOKE_RUNTIME_PERMISSIONS") public void revokeRuntimePermission(@NonNull String, @NonNull String);

    method @RequiresPermission("android.permission.REVOKE_RUNTIME_PERMISSIONS") public void revokeRuntimePermissions(@NonNull java.util.Map<java.lang.String,java.util.List<java.lang.String>>, boolean, int, @NonNull java.util.concurrent.Executor, @NonNull android.permission.PermissionControllerManager.OnRevokeRuntimePermissionsCallback);

    method @RequiresPermission(anyOf={"android.permission.GRANT_RUNTIME_PERMISSIONS", "android.permission.RESTORE_RUNTIME_PERMISSIONS"}) public void stageAndApplyRuntimePermissionsBackup(@NonNull byte[], @NonNull android.os.UserHandle);

    field public static final int COUNT_ONLY_WHEN_GRANTED = 1; // 0x1
@@ -2899,6 +2901,10 @@ package android.permission { 
    field public static final int REASON_MALWARE = 1; // 0x1

  }



  public static interface PermissionControllerManager.OnCountPermissionAppsResultCallback {

    method public void onCountPermissionApps(int);

  }



  public static interface PermissionControllerManager.OnGetAppPermissionResultCallback {

    method public void onGetAppPermissions(@NonNull java.util.List<android.permission.RuntimePermissionPresentationInfo>);

  }

core/java/android/permission/PermissionControllerManager.java

+3 −0
Original line number Diff line number Diff line
@@ -161,6 +161,7 @@ public final class PermissionControllerManager { 
     *

     * @hide

     */

    @TestApi

    public interface OnCountPermissionAppsResultCallback {

        /**

         * The result for {@link #countPermissionApps(List, int,
@@ -514,6 +515,7 @@ public final class PermissionControllerManager { 
     *

     * @hide

     */

    @TestApi

    @RequiresPermission(Manifest.permission.REVOKE_RUNTIME_PERMISSIONS)

    public void revokeRuntimePermission(@NonNull String packageName,

            @NonNull String permissionName) {
@@ -534,6 +536,7 @@ public final class PermissionControllerManager { 
     *

     * @hide

     */

    @TestApi

    @RequiresPermission(Manifest.permission.GET_RUNTIME_PERMISSIONS)

    public void countPermissionApps(@NonNull List<String> permissionNames,

            @CountPermissionAppsFlag int flags,

core/java/android/permission/TEST_MAPPING

+3 −0
Original line number Diff line number Diff line
@@ -5,6 +5,9 @@ 
            "options": [

                {

                    "include-filter": "android.permission.cts.PermissionControllerTest"

                },

                {

                    "include-filter": "android.permission.cts.RuntimePermissionPresentationInfoTest"

                }

            ]

        }