Merge "Make assistant and telephony role names public API." (8768f114) · Commits · e / os / android_frameworks_base

api/current.txt

+3 −0

Original line number	Diff line number	Diff line
		@@ -7435,7 +7435,10 @@ package android.app.role {
		method @NonNull public android.content.Intent createRequestRoleIntent(@NonNull String);
		method public boolean isRoleAvailable(@NonNull String);
		method public boolean isRoleHeld(@NonNull String);
		field public static final String ROLE_ASSISTANT = "android.app.role.ASSISTANT";
		field public static final String ROLE_BROWSER = "android.app.role.BROWSER";
		field public static final String ROLE_CALL_REDIRECTION = "android.app.role.CALL_REDIRECTION";
		field public static final String ROLE_CALL_SCREENING = "android.app.role.CALL_SCREENING";
		field public static final String ROLE_DIALER = "android.app.role.DIALER";
		field public static final String ROLE_EMERGENCY = "android.app.role.EMERGENCY";
		field public static final String ROLE_GALLERY = "android.app.role.GALLERY";

+0 −1

Original line number	Diff line number	Diff line
		@@ -1111,7 +1111,6 @@ package android.app.role {
		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
		field public static final String ROLE_ASSISTANT = "android.app.role.ASSISTANT";
		}

		public interface RoleManagerCallback {

+0 −1

Original line number	Diff line number	Diff line
		@@ -476,7 +476,6 @@ package android.app.role {
		method @NonNull @RequiresPermission("android.permission.MANAGE_ROLE_HOLDERS") public java.util.List<java.lang.String> getRoleHolders(@NonNull String);
		method @NonNull @RequiresPermission("android.permission.MANAGE_ROLE_HOLDERS") public java.util.List<java.lang.String> getRoleHoldersAsUser(@NonNull String, @NonNull android.os.UserHandle);
		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);
		field public static final String ROLE_ASSISTANT = "android.app.role.ASSISTANT";
		}

		public interface RoleManagerCallback {

+1 −9

Original line number	Diff line number	Diff line
		@@ -71,10 +71,8 @@ public final class RoleManager {
		/**
		* The name of the assistant app role.
		*
		* @hide
		* @see android.service.voice.VoiceInteractionService
		*/
		@SystemApi
		@TestApi
		public static final String ROLE_ASSISTANT = "android.app.role.ASSISTANT";

		/**
		@@ -149,9 +147,6 @@ public final class RoleManager {
		* place the call through a call redirection service.
		*
		* @see android.telecom.CallRedirectionService
		*
		* TODO: STOPSHIP: Make name of required roles public API
		* @hide
		*/
		public static final String ROLE_CALL_REDIRECTION = "android.app.role.CALL_REDIRECTION";

		@@ -159,9 +154,6 @@ public final class RoleManager {
		* The name of the call screening and caller id role.
		*
		* @see android.telecom.CallScreeningService
		*
		* TODO: STOPSHIP: Make name of required roles public API
		* @hide
		*/
		public static final String ROLE_CALL_SCREENING = "android.app.role.CALL_SCREENING";