diff options
| -rw-r--r-- | api/system-current.txt | 3 | ||||
| -rw-r--r-- | core/java/android/app/role/RoleManager.java | 12 | ||||
| -rw-r--r-- | core/java/android/content/Intent.java | 31 |
3 files changed, 34 insertions, 12 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index 47500d97c9a4..e5b65b1ce3f0 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -1047,7 +1047,6 @@ package android.app.role { method public void removeRoleHolderAsUser(java.lang.String, java.lang.String, android.os.UserHandle, java.util.concurrent.Executor, android.app.role.RoleManagerCallback); method public boolean removeRoleHolderFromController(java.lang.String, java.lang.String); method public void setRoleNamesFromController(java.util.List<java.lang.String>); - field public static final java.lang.String EXTRA_REQUEST_ROLE_NAME = "android.app.role.extra.REQUEST_ROLE_NAME"; } public abstract interface RoleManagerCallback { @@ -1254,6 +1253,7 @@ package android.content { field public static final java.lang.String ACTION_INSTANT_APP_RESOLVER_SETTINGS = "android.intent.action.INSTANT_APP_RESOLVER_SETTINGS"; field public static final java.lang.String ACTION_INTENT_FILTER_NEEDS_VERIFICATION = "android.intent.action.INTENT_FILTER_NEEDS_VERIFICATION"; field public static final java.lang.String ACTION_MANAGE_APP_PERMISSIONS = "android.intent.action.MANAGE_APP_PERMISSIONS"; + field public static final java.lang.String ACTION_MANAGE_DEFAULT_APP = "android.intent.action.MANAGE_DEFAULT_APP"; field public static final java.lang.String ACTION_MANAGE_PERMISSIONS = "android.intent.action.MANAGE_PERMISSIONS"; field public static final java.lang.String ACTION_MANAGE_PERMISSION_APPS = "android.intent.action.MANAGE_PERMISSION_APPS"; field public static final java.lang.String ACTION_MANAGE_SPECIAL_APP_ACCESSES = "android.intent.action.MANAGE_SPECIAL_APP_ACCESSES"; @@ -1289,6 +1289,7 @@ package android.content { field public static final java.lang.String EXTRA_REASON = "android.intent.extra.REASON"; field public static final java.lang.String EXTRA_REMOTE_CALLBACK = "android.intent.extra.REMOTE_CALLBACK"; field public static final java.lang.String EXTRA_RESULT_NEEDED = "android.intent.extra.RESULT_NEEDED"; + field public static final java.lang.String EXTRA_ROLE_NAME = "android.intent.extra.ROLE_NAME"; field public static final java.lang.String EXTRA_UNKNOWN_INSTANT_APP = "android.intent.extra.UNKNOWN_INSTANT_APP"; field public static final java.lang.String EXTRA_VERIFICATION_BUNDLE = "android.intent.extra.VERIFICATION_BUNDLE"; field public static final java.lang.String METADATA_SETUP_VERSION = "android.SETUP_VERSION"; diff --git a/core/java/android/app/role/RoleManager.java b/core/java/android/app/role/RoleManager.java index 27581fc0088a..a6abe0b30f79 100644 --- a/core/java/android/app/role/RoleManager.java +++ b/core/java/android/app/role/RoleManager.java @@ -179,16 +179,6 @@ public final class RoleManager { public static final String ACTION_REQUEST_ROLE = "android.app.role.action.REQUEST_ROLE"; /** - * The name of the requested role. - * <p> - * <strong>Type:</strong> String - * - * @hide - */ - @SystemApi - public static final String EXTRA_REQUEST_ROLE_NAME = "android.app.role.extra.REQUEST_ROLE_NAME"; - - /** * The permission required to manage records of role holders in {@link RoleManager} directly. * * @hide @@ -236,7 +226,7 @@ public final class RoleManager { Preconditions.checkStringNotEmpty(roleName, "roleName cannot be null or empty"); Intent intent = new Intent(ACTION_REQUEST_ROLE); intent.setPackage(mContext.getPackageManager().getPermissionControllerPackageName()); - intent.putExtra(EXTRA_REQUEST_ROLE_NAME, roleName); + intent.putExtra(Intent.EXTRA_ROLE_NAME, roleName); return intent; } diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index 6086aa6852eb..d27cce535c3b 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -1833,6 +1833,37 @@ public class Intent implements Parcelable, Cloneable { "android.intent.action.REVIEW_PERMISSIONS"; /** + * Activity action: Launch UI to manage a default app. + * <p> + * Input: {@link #EXTRA_ROLE_NAME} specifies the role of the default app which will be managed + * by the launched UI. + * </p> + * <p> + * Output: Nothing. + * </p> + * + * @hide + */ + @RequiresPermission(android.Manifest.permission.MANAGE_ROLE_HOLDERS) + @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) + @SystemApi + public static final String ACTION_MANAGE_DEFAULT_APP = + "android.intent.action.MANAGE_DEFAULT_APP"; + + /** + * Intent extra: A role name. + * <p> + * Type: String + * </p> + * + * @see android.app.role.RoleManager + * + * @hide + */ + @SystemApi + public static final String EXTRA_ROLE_NAME = "android.intent.extra.ROLE_NAME"; + + /** * Activity action: Launch UI to manage special app accesses. * <p> * Input: Nothing. |