diff options
| author | 2019-03-05 15:41:59 +0000 | |
|---|---|---|
| committer | 2019-03-05 15:41:59 +0000 | |
| commit | e4099d58aef5dce8734a375539ad006d7645d0fb (patch) | |
| tree | e1aff1cfc054c468891dcf715b05010cb53c8e5e | |
| parent | 06916df886e88a11f2b13c22940e8015a39c184c (diff) | |
| parent | 2293da24672e908e0002b1c0fd6a6c90cf1291f2 (diff) | |
Merge "Mark manage holder flag as test API"
| -rw-r--r-- | api/test-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/app/role/RoleManager.java | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/api/test-current.txt b/api/test-current.txt index 684524e8987b..c0701718306d 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -523,6 +523,7 @@ package android.app.role { method @RequiresPermission("android.permission.MANAGE_ROLE_HOLDERS") public void removeRoleHolderAsUser(@NonNull String, @NonNull String, int, @NonNull android.os.UserHandle, @NonNull java.util.concurrent.Executor, @NonNull android.app.role.RoleManagerCallback); method @RequiresPermission("com.android.permissioncontroller.permission.MANAGE_ROLES_FROM_CONTROLLER") public boolean removeRoleHolderFromController(@NonNull String, @NonNull String); method @RequiresPermission("com.android.permissioncontroller.permission.MANAGE_ROLES_FROM_CONTROLLER") public void setRoleNamesFromController(@NonNull java.util.List<java.lang.String>); + field public static final int MANAGE_HOLDERS_FLAG_DONT_KILL_APP = 1; // 0x1 } public interface RoleManagerCallback { diff --git a/core/java/android/app/role/RoleManager.java b/core/java/android/app/role/RoleManager.java index c665cb238028..f91d8780084f 100644 --- a/core/java/android/app/role/RoleManager.java +++ b/core/java/android/app/role/RoleManager.java @@ -187,6 +187,7 @@ public final class RoleManager { * @hide */ @SystemApi + @TestApi public static final int MANAGE_HOLDERS_FLAG_DONT_KILL_APP = 1; /** |