Merge "Mark role related APIs as test API." (abc2a7d5) · Commits · e / os / android_frameworks_base

api/test-current.txt

+14 −0

Original line number	Diff line number	Diff line
		@@ -474,12 +474,22 @@ package android.app.prediction {

		package android.app.role {

		public interface OnRoleHoldersChangedListener {
		method public void onRoleHoldersChanged(@NonNull String, @NonNull android.os.UserHandle);
		}

		public final class RoleManager {
		method @RequiresPermission("android.permission.OBSERVE_ROLE_HOLDERS") public void addOnRoleHoldersChangedListenerAsUser(@NonNull java.util.concurrent.Executor, @NonNull android.app.role.OnRoleHoldersChangedListener, @NonNull android.os.UserHandle);
		method @RequiresPermission("android.permission.MANAGE_ROLE_HOLDERS") public void addRoleHolderAsUser(@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 addRoleHolderFromController(@NonNull String, @NonNull String);
		method @RequiresPermission("android.permission.MANAGE_ROLE_HOLDERS") public void clearRoleHoldersAsUser(@NonNull String, int, @NonNull android.os.UserHandle, @NonNull java.util.concurrent.Executor, @NonNull android.app.role.RoleManagerCallback);
		method @NonNull @RequiresPermission("com.android.permissioncontroller.permission.MANAGE_ROLES_FROM_CONTROLLER") public java.util.List<java.lang.String> getHeldRolesFromController(@NonNull String);
		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.OBSERVE_ROLE_HOLDERS") public void removeOnRoleHoldersChangedListenerAsUser(@NonNull android.app.role.OnRoleHoldersChangedListener, @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);
		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>);
		}

		public interface RoleManagerCallback {
		@@ -562,6 +572,10 @@ package android.content {
		method public android.view.Display getDisplay();
		}

		public class Intent implements java.lang.Cloneable android.os.Parcelable {
		field public static final String EXTRA_ROLE_NAME = "android.intent.extra.ROLE_NAME";
		}

		}

		package android.content.pm {

core/java/android/app/role/OnRoleHoldersChangedListener.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ package android.app.role;

		import android.annotation.NonNull;
		import android.annotation.SystemApi;
		import android.annotation.TestApi;
		import android.os.UserHandle;

		/**
		@@ -26,6 +27,7 @@ import android.os.UserHandle;
		* @hide
		*/
		@SystemApi
		@TestApi
		public interface OnRoleHoldersChangedListener {

		/**

core/java/android/app/role/RoleManager.java

+7 −1

Original line number	Diff line number	Diff line
		@@ -467,6 +467,7 @@ public final class RoleManager {
		*/
		@RequiresPermission(Manifest.permission.OBSERVE_ROLE_HOLDERS)
		@SystemApi
		@TestApi
		public void addOnRoleHoldersChangedListenerAsUser(@CallbackExecutor @NonNull Executor executor,
		@NonNull OnRoleHoldersChangedListener listener, @NonNull UserHandle user) {
		Preconditions.checkNotNull(executor, "executor cannot be null");
		@@ -512,6 +513,7 @@ public final class RoleManager {
		*/
		@RequiresPermission(Manifest.permission.OBSERVE_ROLE_HOLDERS)
		@SystemApi
		@TestApi
		public void removeOnRoleHoldersChangedListenerAsUser(
		@NonNull OnRoleHoldersChangedListener listener, @NonNull UserHandle user) {
		Preconditions.checkNotNull(listener, "listener cannot be null");
		@@ -553,6 +555,7 @@ public final class RoleManager {
		*/
		@RequiresPermission(PERMISSION_MANAGE_ROLES_FROM_CONTROLLER)
		@SystemApi
		@TestApi
		public void setRoleNamesFromController(@NonNull List<String> roleNames) {
		Preconditions.checkNotNull(roleNames, "roleNames cannot be null");
		try {
		@@ -583,6 +586,7 @@ public final class RoleManager {
		*/
		@RequiresPermission(PERMISSION_MANAGE_ROLES_FROM_CONTROLLER)
		@SystemApi
		@TestApi
		public boolean addRoleHolderFromController(@NonNull String roleName,
		@NonNull String packageName) {
		Preconditions.checkStringNotEmpty(roleName, "roleName cannot be null or empty");
		@@ -615,6 +619,7 @@ public final class RoleManager {
		*/
		@RequiresPermission(PERMISSION_MANAGE_ROLES_FROM_CONTROLLER)
		@SystemApi
		@TestApi
		public boolean removeRoleHolderFromController(@NonNull String roleName,
		@NonNull String packageName) {
		Preconditions.checkStringNotEmpty(roleName, "roleName cannot be null or empty");
		@@ -634,9 +639,10 @@ public final class RoleManager {
		*
		* @hide
		*/
		@NonNull
		@RequiresPermission(PERMISSION_MANAGE_ROLES_FROM_CONTROLLER)
		@SystemApi
		@NonNull
		@TestApi
		public List<String> getHeldRolesFromController(@NonNull String packageName) {
		Preconditions.checkStringNotEmpty(packageName, "packageName cannot be null or empty");
		try {

core/java/android/content/Intent.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@ import android.annotation.RequiresPermission;
		import android.annotation.SdkConstant;
		import android.annotation.SdkConstant.SdkConstantType;
		import android.annotation.SystemApi;
		import android.annotation.TestApi;
		import android.annotation.UnsupportedAppUsage;
		import android.content.pm.ActivityInfo;
		import android.content.pm.ApplicationInfo;
		@@ -1902,6 +1903,7 @@ public class Intent implements Parcelable, Cloneable {
		* @hide
		*/
		@SystemApi
		@TestApi
		public static final String EXTRA_ROLE_NAME = "android.intent.extra.ROLE_NAME";

		/**