Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2020-04-27 16:16:28 +00:00
committed by Android (Google) Code Review
parent c7b99da139 18247c1a8c
commit bac5755dad
3 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
api/test-current.txt
View File

@@ -2889,8 +2889,10 @@ package android.permission {
public final class PermissionControllerManager { 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(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 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.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("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); 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 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 field public static final int REASON_MALWARE = 1; // 0x1
} }
public static interface PermissionControllerManager.OnCountPermissionAppsResultCallback {
method public void onCountPermissionApps(int);
}
public static interface PermissionControllerManager.OnGetAppPermissionResultCallback { public static interface PermissionControllerManager.OnGetAppPermissionResultCallback {
method public void onGetAppPermissions(@NonNull java.util.List<android.permission.RuntimePermissionPresentationInfo>); method public void onGetAppPermissions(@NonNull java.util.List<android.permission.RuntimePermissionPresentationInfo>);
} }

3
core/java/android/permission/PermissionControllerManager.java
View File

@@ -161,6 +161,7 @@ public final class PermissionControllerManager {
* *
* @hide * @hide
*/ */
@TestApi
public interface OnCountPermissionAppsResultCallback { public interface OnCountPermissionAppsResultCallback {
/** /**
* The result for {@link #countPermissionApps(List, int, * The result for {@link #countPermissionApps(List, int,
@@ -514,6 +515,7 @@ public final class PermissionControllerManager {
* *
* @hide * @hide
*/ */
@TestApi
@RequiresPermission(Manifest.permission.REVOKE_RUNTIME_PERMISSIONS) @RequiresPermission(Manifest.permission.REVOKE_RUNTIME_PERMISSIONS)
public void revokeRuntimePermission(@NonNull String packageName, public void revokeRuntimePermission(@NonNull String packageName,
@NonNull String permissionName) { @NonNull String permissionName) {
@@ -534,6 +536,7 @@ public final class PermissionControllerManager {
* *
* @hide * @hide
*/ */
@TestApi
@RequiresPermission(Manifest.permission.GET_RUNTIME_PERMISSIONS) @RequiresPermission(Manifest.permission.GET_RUNTIME_PERMISSIONS)
public void countPermissionApps(@NonNull List<String> permissionNames, public void countPermissionApps(@NonNull List<String> permissionNames,
@CountPermissionAppsFlag int flags, @CountPermissionAppsFlag int flags,

3
core/java/android/permission/TEST_MAPPING
View File

@@ -5,6 +5,9 @@
"options": [ "options": [
{ {
"include-filter": "android.permission.cts.PermissionControllerTest" "include-filter": "android.permission.cts.PermissionControllerTest"
},
{
"include-filter": "android.permission.cts.RuntimePermissionPresentationInfoTest"
} }
] ]
} }