Merge "Minor renamings in DevicePolicyManager" into tm-dev (045cc2ab) · Commits · e / os / android_frameworks_base

core/api/system-current.txt

+16 −16

Original line number	Original line	Diff line number	Diff line
	@@ -1075,7 +1075,7 @@ package android.app.admin {
	}		}

	public class DevicePolicyManager {		public class DevicePolicyManager {
	method @RequiresPermission(android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS) public int checkProvisioningPreCondition(@NonNull String, @NonNull String);		method @RequiresPermission(android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS) public int checkProvisioningPrecondition(@NonNull String, @NonNull String);
	method @Nullable @RequiresPermission(android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS) public android.os.UserHandle createAndProvisionManagedProfile(@NonNull android.app.admin.ManagedProfileProvisioningParams) throws android.app.admin.ProvisioningException;		method @Nullable @RequiresPermission(android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS) public android.os.UserHandle createAndProvisionManagedProfile(@NonNull android.app.admin.ManagedProfileProvisioningParams) throws android.app.admin.ProvisioningException;
	method @Nullable public android.content.Intent createProvisioningIntentFromNfcIntent(@NonNull android.content.Intent);		method @Nullable public android.content.Intent createProvisioningIntentFromNfcIntent(@NonNull android.content.Intent);
	method @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS) public boolean getBluetoothContactSharingDisabled(@NonNull android.os.UserHandle);		method @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS) public boolean getBluetoothContactSharingDisabled(@NonNull android.os.UserHandle);
	@@ -1128,21 +1128,6 @@ package android.app.admin {
	field public static final String ACTION_SET_PROFILE_OWNER = "android.app.action.SET_PROFILE_OWNER";		field public static final String ACTION_SET_PROFILE_OWNER = "android.app.action.SET_PROFILE_OWNER";
	field @Deprecated public static final String ACTION_STATE_USER_SETUP_COMPLETE = "android.app.action.STATE_USER_SETUP_COMPLETE";		field @Deprecated public static final String ACTION_STATE_USER_SETUP_COMPLETE = "android.app.action.STATE_USER_SETUP_COMPLETE";
	field @RequiresPermission(android.Manifest.permission.LAUNCH_DEVICE_MANAGER_SETUP) public static final String ACTION_UPDATE_DEVICE_MANAGEMENT_ROLE_HOLDER = "android.app.action.UPDATE_DEVICE_MANAGEMENT_ROLE_HOLDER";		field @RequiresPermission(android.Manifest.permission.LAUNCH_DEVICE_MANAGER_SETUP) public static final String ACTION_UPDATE_DEVICE_MANAGEMENT_ROLE_HOLDER = "android.app.action.UPDATE_DEVICE_MANAGEMENT_ROLE_HOLDER";
	field public static final int CODE_ACCOUNTS_NOT_EMPTY = 6; // 0x6
	field public static final int CODE_CANNOT_ADD_MANAGED_PROFILE = 11; // 0xb
	field public static final int CODE_DEVICE_ADMIN_NOT_SUPPORTED = 13; // 0xd
	field public static final int CODE_HAS_DEVICE_OWNER = 1; // 0x1
	field public static final int CODE_HAS_PAIRED = 8; // 0x8
	field public static final int CODE_MANAGED_USERS_NOT_SUPPORTED = 9; // 0x9
	field public static final int CODE_NONSYSTEM_USER_EXISTS = 5; // 0x5
	field public static final int CODE_NOT_SYSTEM_USER = 7; // 0x7
	field public static final int CODE_OK = 0; // 0x0
	field public static final int CODE_PROVISIONING_NOT_ALLOWED_FOR_NON_DEVELOPER_USERS = 15; // 0xf
	field public static final int CODE_SYSTEM_USER = 10; // 0xa
	field public static final int CODE_UNKNOWN_ERROR = -1; // 0xffffffff
	field public static final int CODE_USER_HAS_PROFILE_OWNER = 2; // 0x2
	field public static final int CODE_USER_NOT_RUNNING = 3; // 0x3
	field public static final int CODE_USER_SETUP_COMPLETED = 4; // 0x4
	field public static final String EXTRA_FORCE_UPDATE_ROLE_HOLDER = "android.app.extra.FORCE_UPDATE_ROLE_HOLDER";		field public static final String EXTRA_FORCE_UPDATE_ROLE_HOLDER = "android.app.extra.FORCE_UPDATE_ROLE_HOLDER";
	field public static final String EXTRA_LOST_MODE_LOCATION = "android.app.extra.LOST_MODE_LOCATION";		field public static final String EXTRA_LOST_MODE_LOCATION = "android.app.extra.LOST_MODE_LOCATION";
	field public static final String EXTRA_PROFILE_OWNER_NAME = "android.app.extra.PROFILE_OWNER_NAME";		field public static final String EXTRA_PROFILE_OWNER_NAME = "android.app.extra.PROFILE_OWNER_NAME";
	@@ -1185,6 +1170,21 @@ package android.app.admin {
	field public static final int STATE_USER_SETUP_FINALIZED = 3; // 0x3		field public static final int STATE_USER_SETUP_FINALIZED = 3; // 0x3
	field public static final int STATE_USER_SETUP_INCOMPLETE = 1; // 0x1		field public static final int STATE_USER_SETUP_INCOMPLETE = 1; // 0x1
	field public static final int STATE_USER_UNMANAGED = 0; // 0x0		field public static final int STATE_USER_UNMANAGED = 0; // 0x0
			field public static final int STATUS_ACCOUNTS_NOT_EMPTY = 6; // 0x6
			field public static final int STATUS_CANNOT_ADD_MANAGED_PROFILE = 11; // 0xb
			field public static final int STATUS_DEVICE_ADMIN_NOT_SUPPORTED = 13; // 0xd
			field public static final int STATUS_HAS_DEVICE_OWNER = 1; // 0x1
			field public static final int STATUS_HAS_PAIRED = 8; // 0x8
			field public static final int STATUS_MANAGED_USERS_NOT_SUPPORTED = 9; // 0x9
			field public static final int STATUS_NONSYSTEM_USER_EXISTS = 5; // 0x5
			field public static final int STATUS_NOT_SYSTEM_USER = 7; // 0x7
			field public static final int STATUS_OK = 0; // 0x0
			field public static final int STATUS_PROVISIONING_NOT_ALLOWED_FOR_NON_DEVELOPER_USERS = 15; // 0xf
			field public static final int STATUS_SYSTEM_USER = 10; // 0xa
			field public static final int STATUS_UNKNOWN_ERROR = -1; // 0xffffffff
			field public static final int STATUS_USER_HAS_PROFILE_OWNER = 2; // 0x2
			field public static final int STATUS_USER_NOT_RUNNING = 3; // 0x3
			field public static final int STATUS_USER_SETUP_COMPLETED = 4; // 0x4
	}		}

	public static final class DevicePolicyResources.Strings {		public static final class DevicePolicyResources.Strings {

core/api/test-current.txt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -525,7 +525,6 @@ package android.app.admin {
	method @RequiresPermission(android.Manifest.permission.MANAGE_DEVICE_ADMINS) public void setNextOperationSafety(int, int);		method @RequiresPermission(android.Manifest.permission.MANAGE_DEVICE_ADMINS) public void setNextOperationSafety(int, int);
	field public static final String ACTION_DATA_SHARING_RESTRICTION_APPLIED = "android.app.action.DATA_SHARING_RESTRICTION_APPLIED";		field public static final String ACTION_DATA_SHARING_RESTRICTION_APPLIED = "android.app.action.DATA_SHARING_RESTRICTION_APPLIED";
	field public static final String ACTION_DEVICE_POLICY_CONSTANTS_CHANGED = "android.app.action.DEVICE_POLICY_CONSTANTS_CHANGED";		field public static final String ACTION_DEVICE_POLICY_CONSTANTS_CHANGED = "android.app.action.DEVICE_POLICY_CONSTANTS_CHANGED";
	field @Deprecated public static final int CODE_SPLIT_SYSTEM_USER_DEVICE_SYSTEM_USER = 14; // 0xe
	field public static final int DEVICE_OWNER_TYPE_DEFAULT = 0; // 0x0		field public static final int DEVICE_OWNER_TYPE_DEFAULT = 0; // 0x0
	field public static final int DEVICE_OWNER_TYPE_FINANCED = 1; // 0x1		field public static final int DEVICE_OWNER_TYPE_FINANCED = 1; // 0x1
	field public static final int OPERATION_CLEAR_APPLICATION_USER_DATA = 23; // 0x17		field public static final int OPERATION_CLEAR_APPLICATION_USER_DATA = 23; // 0x17
	@@ -569,6 +568,7 @@ package android.app.admin {
	field public static final int OPERATION_SWITCH_USER = 2; // 0x2		field public static final int OPERATION_SWITCH_USER = 2; // 0x2
	field public static final int OPERATION_UNINSTALL_CA_CERT = 40; // 0x28		field public static final int OPERATION_UNINSTALL_CA_CERT = 40; // 0x28
	field public static final int OPERATION_WIPE_DATA = 8; // 0x8		field public static final int OPERATION_WIPE_DATA = 8; // 0x8
			field @Deprecated public static final int STATUS_SPLIT_SYSTEM_USER_DEVICE_SYSTEM_USER = 14; // 0xe
	}		}

	public static final class SecurityLog.SecurityEvent implements android.os.Parcelable {		public static final class SecurityLog.SecurityEvent implements android.os.Parcelable {

core/java/android/app/admin/DevicePolicyManager.java

+45 −53

Original line number	Original line	Diff line number	Diff line
	@@ -2523,7 +2523,7 @@ public class DevicePolicyManager {
	public @interface UserProvisioningState {}		public @interface UserProvisioningState {}

	/**		/**
	* Result code for {@link #checkProvisioningPreCondition}.		* Result code for {@link #checkProvisioningPrecondition}.
	*		*
	* <p>Unknown error code returned for {@link #ACTION_PROVISION_MANAGED_DEVICE},		* <p>Unknown error code returned for {@link #ACTION_PROVISION_MANAGED_DEVICE},
	* {@link #ACTION_PROVISION_MANAGED_PROFILE} and {@link #ACTION_PROVISION_MANAGED_USER}.		* {@link #ACTION_PROVISION_MANAGED_PROFILE} and {@link #ACTION_PROVISION_MANAGED_USER}.
	@@ -2531,10 +2531,10 @@ public class DevicePolicyManager {
	* @hide		* @hide
	*/		*/
	@SystemApi		@SystemApi
	public static final int CODE_UNKNOWN_ERROR = -1;		public static final int STATUS_UNKNOWN_ERROR = -1;

	/**		/**
	* Result code for {@link #checkProvisioningPreCondition}.		* Result code for {@link #checkProvisioningPrecondition}.
	*		*
	* <p>Returned for {@link #ACTION_PROVISION_MANAGED_DEVICE},		* <p>Returned for {@link #ACTION_PROVISION_MANAGED_DEVICE},
	* {@link #ACTION_PROVISION_MANAGED_PROFILE} and {@link #ACTION_PROVISION_MANAGED_USER}		* {@link #ACTION_PROVISION_MANAGED_PROFILE} and {@link #ACTION_PROVISION_MANAGED_USER}
	@@ -2543,10 +2543,10 @@ public class DevicePolicyManager {
	* @hide		* @hide
	*/		*/
	@SystemApi		@SystemApi
	public static final int CODE_OK = 0;		public static final int STATUS_OK = 0;

	/**		/**
	* Result code for {@link #checkProvisioningPreCondition}.		* Result code for {@link #checkProvisioningPrecondition}.
	*		*
	* <p>Returned for {@link #ACTION_PROVISION_MANAGED_DEVICE} when the device already has a		* <p>Returned for {@link #ACTION_PROVISION_MANAGED_DEVICE} when the device already has a
	* device owner.		* device owner.
	@@ -2554,10 +2554,10 @@ public class DevicePolicyManager {
	* @hide		* @hide
	*/		*/
	@SystemApi		@SystemApi
	public static final int CODE_HAS_DEVICE_OWNER = 1;		public static final int STATUS_HAS_DEVICE_OWNER = 1;

	/**		/**
	* Result code for {@link #checkProvisioningPreCondition}.		* Result code for {@link #checkProvisioningPrecondition}.
	*		*
	* <p>Returned for {@link #ACTION_PROVISION_MANAGED_DEVICE} when the user has a profile owner		* <p>Returned for {@link #ACTION_PROVISION_MANAGED_DEVICE} when the user has a profile owner
	* and for {@link #ACTION_PROVISION_MANAGED_PROFILE} when the profile owner is already set.		* and for {@link #ACTION_PROVISION_MANAGED_PROFILE} when the profile owner is already set.
	@@ -2565,20 +2565,20 @@ public class DevicePolicyManager {
	* @hide		* @hide
	*/		*/
	@SystemApi		@SystemApi
	public static final int CODE_USER_HAS_PROFILE_OWNER = 2;		public static final int STATUS_USER_HAS_PROFILE_OWNER = 2;

	/**		/**
	* Result code for {@link #checkProvisioningPreCondition}.		* Result code for {@link #checkProvisioningPrecondition}.
	*		*
	* <p>Returned for {@link #ACTION_PROVISION_MANAGED_DEVICE} when the user isn't running.		* <p>Returned for {@link #ACTION_PROVISION_MANAGED_DEVICE} when the user isn't running.
	*		*
	* @hide		* @hide
	*/		*/
	@SystemApi		@SystemApi
	public static final int CODE_USER_NOT_RUNNING = 3;		public static final int STATUS_USER_NOT_RUNNING = 3;

	/**		/**
	* Result code for {@link #checkProvisioningPreCondition}.		* Result code for {@link #checkProvisioningPrecondition}.
	*		*
	* <p>Returned for {@link #ACTION_PROVISION_MANAGED_DEVICE} if the device has already been		* <p>Returned for {@link #ACTION_PROVISION_MANAGED_DEVICE} if the device has already been
	* setup and for {@link #ACTION_PROVISION_MANAGED_USER} if the user has already been setup.		* setup and for {@link #ACTION_PROVISION_MANAGED_USER} if the user has already been setup.
	@@ -2586,7 +2586,7 @@ public class DevicePolicyManager {
	* @hide		* @hide
	*/		*/
	@SystemApi		@SystemApi
	public static final int CODE_USER_SETUP_COMPLETED = 4;		public static final int STATUS_USER_SETUP_COMPLETED = 4;

	/**		/**
	* Code used to indicate that the device also has a user other than the system user.		* Code used to indicate that the device also has a user other than the system user.
	@@ -2594,7 +2594,7 @@ public class DevicePolicyManager {
	* @hide		* @hide
	*/		*/
	@SystemApi		@SystemApi
	public static final int CODE_NONSYSTEM_USER_EXISTS = 5;		public static final int STATUS_NONSYSTEM_USER_EXISTS = 5;

	/**		/**
	* Code used to indicate that device has an account that prevents provisioning.		* Code used to indicate that device has an account that prevents provisioning.
	@@ -2602,20 +2602,20 @@ public class DevicePolicyManager {
	* @hide		* @hide
	*/		*/
	@SystemApi		@SystemApi
	public static final int CODE_ACCOUNTS_NOT_EMPTY = 6;		public static final int STATUS_ACCOUNTS_NOT_EMPTY = 6;

	/**		/**
	* Result code for {@link #checkProvisioningPreCondition}.		* Result code for {@link #checkProvisioningPrecondition}.
	*		*
	* <p>Returned for {@link #ACTION_PROVISION_MANAGED_DEVICE} if the user is not a system user.		* <p>Returned for {@link #ACTION_PROVISION_MANAGED_DEVICE} if the user is not a system user.
	*		*
	* @hide		* @hide
	*/		*/
	@SystemApi		@SystemApi
	public static final int CODE_NOT_SYSTEM_USER = 7;		public static final int STATUS_NOT_SYSTEM_USER = 7;

	/**		/**
	* Result code for {@link #checkProvisioningPreCondition}.		* Result code for {@link #checkProvisioningPrecondition}.
	*		*
	* <p>Returned for {@link #ACTION_PROVISION_MANAGED_DEVICE} and		* <p>Returned for {@link #ACTION_PROVISION_MANAGED_DEVICE} and
	* {@link #ACTION_PROVISION_MANAGED_USER} when the device is a watch and is already paired.		* {@link #ACTION_PROVISION_MANAGED_USER} when the device is a watch and is already paired.
	@@ -2623,10 +2623,10 @@ public class DevicePolicyManager {
	* @hide		* @hide
	*/		*/
	@SystemApi		@SystemApi
	public static final int CODE_HAS_PAIRED = 8;		public static final int STATUS_HAS_PAIRED = 8;

	/**		/**
	* Result code for {@link #checkProvisioningPreCondition}.		* Result code for {@link #checkProvisioningPrecondition}.
	*		*
	* <p>Returned for {@link #ACTION_PROVISION_MANAGED_PROFILE} and		* <p>Returned for {@link #ACTION_PROVISION_MANAGED_PROFILE} and
	* {@link #ACTION_PROVISION_MANAGED_USER} on devices which do not support managed users.		* {@link #ACTION_PROVISION_MANAGED_USER} on devices which do not support managed users.
	@@ -2635,10 +2635,10 @@ public class DevicePolicyManager {
	* @hide		* @hide
	*/		*/
	@SystemApi		@SystemApi
	public static final int CODE_MANAGED_USERS_NOT_SUPPORTED = 9;		public static final int STATUS_MANAGED_USERS_NOT_SUPPORTED = 9;

	/**		/**
	* Result code for {@link #checkProvisioningPreCondition}.		* Result code for {@link #checkProvisioningPrecondition}.
	*		*
	* <p>Returned for {@link #ACTION_PROVISION_MANAGED_USER} if the user is a system user and		* <p>Returned for {@link #ACTION_PROVISION_MANAGED_USER} if the user is a system user and
	* for {@link #ACTION_PROVISION_MANAGED_DEVICE} on devices running headless system user mode		* for {@link #ACTION_PROVISION_MANAGED_DEVICE} on devices running headless system user mode
	@@ -2647,10 +2647,10 @@ public class DevicePolicyManager {
	* @hide		* @hide
	*/		*/
	@SystemApi		@SystemApi
	public static final int CODE_SYSTEM_USER = 10;		public static final int STATUS_SYSTEM_USER = 10;

	/**		/**
	* Result code for {@link #checkProvisioningPreCondition}.		* Result code for {@link #checkProvisioningPrecondition}.
	*		*
	* <p>Returned for {@link #ACTION_PROVISION_MANAGED_PROFILE} when the user cannot have more		* <p>Returned for {@link #ACTION_PROVISION_MANAGED_PROFILE} when the user cannot have more
	* managed profiles.		* managed profiles.
	@@ -2658,19 +2658,10 @@ public class DevicePolicyManager {
	* @hide		* @hide
	*/		*/
	@SystemApi		@SystemApi
	public static final int CODE_CANNOT_ADD_MANAGED_PROFILE = 11;		public static final int STATUS_CANNOT_ADD_MANAGED_PROFILE = 11;

	/**		/**
	* TODO (b/137101239): clean up split system user codes		* Result code for {@link #checkProvisioningPrecondition}.
	*
	* @hide
	* @deprecated not used anymore but can't be removed since it's a @TestApi.
	**/
	@Deprecated
	public static final int CODE_NOT_SYSTEM_USER_SPLIT = 12;

	/**
	* Result code for {@link #checkProvisioningPreCondition}.
	*		*
	* <p>Returned for {@link #ACTION_PROVISION_MANAGED_DEVICE},		* <p>Returned for {@link #ACTION_PROVISION_MANAGED_DEVICE},
	* {@link #ACTION_PROVISION_MANAGED_PROFILE} on devices which do not support device		* {@link #ACTION_PROVISION_MANAGED_PROFILE} on devices which do not support device
	@@ -2679,21 +2670,21 @@ public class DevicePolicyManager {
	* @hide		* @hide
	*/		*/
	@SystemApi		@SystemApi
	public static final int CODE_DEVICE_ADMIN_NOT_SUPPORTED = 13;		public static final int STATUS_DEVICE_ADMIN_NOT_SUPPORTED = 13;

	/**		/**
	* TODO (b/137101239): clean up split system user codes		* TODO (b/137101239): clean up split system user codes
	* Result code for {@link #checkProvisioningPreCondition}.		* Result code for {@link #checkProvisioningPrecondition}.
	*		*
	* @hide		* @hide
	* @deprecated not used anymore but can't be removed since it's a @TestApi.		* @deprecated not used anymore but can't be removed since it's a @TestApi.
	*/		*/
	@Deprecated		@Deprecated
	@TestApi		@TestApi
	public static final int CODE_SPLIT_SYSTEM_USER_DEVICE_SYSTEM_USER = 14;		public static final int STATUS_SPLIT_SYSTEM_USER_DEVICE_SYSTEM_USER = 14;

	/**		/**
	* Result code for {@link #checkProvisioningPreCondition}.		* Result code for {@link #checkProvisioningPrecondition}.
	*		*
	* <p>Returned for {@link #ACTION_PROVISION_MANAGED_DEVICE} and		* <p>Returned for {@link #ACTION_PROVISION_MANAGED_DEVICE} and
	* {@link #ACTION_PROVISION_MANAGED_PROFILE} on devices which do not support provisioning.		* {@link #ACTION_PROVISION_MANAGED_PROFILE} on devices which do not support provisioning.
	@@ -2701,24 +2692,24 @@ public class DevicePolicyManager {
	* @hide		* @hide
	*/		*/
	@SystemApi		@SystemApi
	public static final int CODE_PROVISIONING_NOT_ALLOWED_FOR_NON_DEVELOPER_USERS = 15;		public static final int STATUS_PROVISIONING_NOT_ALLOWED_FOR_NON_DEVELOPER_USERS = 15;

	/**		/**
	* Result codes for {@link #checkProvisioningPreCondition} indicating all the provisioning pre		* Result codes for {@link #checkProvisioningPrecondition} indicating all the provisioning pre
	* conditions.		* conditions.
	*		*
	* @hide		* @hide
	*/		*/
	@Retention(RetentionPolicy.SOURCE)		@Retention(RetentionPolicy.SOURCE)
	@IntDef(prefix = { "CODE_" }, value = {		@IntDef(prefix = { "STATUS_" }, value = {
	CODE_UNKNOWN_ERROR, CODE_OK, CODE_HAS_DEVICE_OWNER, CODE_USER_HAS_PROFILE_OWNER,		STATUS_UNKNOWN_ERROR, STATUS_OK, STATUS_HAS_DEVICE_OWNER, STATUS_USER_HAS_PROFILE_OWNER,
	CODE_USER_NOT_RUNNING, CODE_USER_SETUP_COMPLETED, CODE_NOT_SYSTEM_USER, CODE_HAS_PAIRED,		STATUS_USER_NOT_RUNNING, STATUS_USER_SETUP_COMPLETED, STATUS_NOT_SYSTEM_USER,
	CODE_MANAGED_USERS_NOT_SUPPORTED, CODE_SYSTEM_USER, CODE_CANNOT_ADD_MANAGED_PROFILE,		STATUS_HAS_PAIRED, STATUS_MANAGED_USERS_NOT_SUPPORTED, STATUS_SYSTEM_USER,
	CODE_NOT_SYSTEM_USER_SPLIT, CODE_DEVICE_ADMIN_NOT_SUPPORTED,		STATUS_CANNOT_ADD_MANAGED_PROFILE, STATUS_DEVICE_ADMIN_NOT_SUPPORTED,
	CODE_SPLIT_SYSTEM_USER_DEVICE_SYSTEM_USER,		STATUS_SPLIT_SYSTEM_USER_DEVICE_SYSTEM_USER,
	CODE_PROVISIONING_NOT_ALLOWED_FOR_NON_DEVELOPER_USERS		STATUS_PROVISIONING_NOT_ALLOWED_FOR_NON_DEVELOPER_USERS
	})		})
	public @interface ProvisioningPreCondition {}		public @interface ProvisioningPrecondition {}

	/**		/**
	* Disable all configurable SystemUI features during LockTask mode. This includes,		* Disable all configurable SystemUI features during LockTask mode. This includes,
	@@ -11996,15 +11987,16 @@ public class DevicePolicyManager {
	* {@link #ACTION_PROVISION_MANAGED_PROFILE}		* {@link #ACTION_PROVISION_MANAGED_PROFILE}
	* @param packageName The package of the component that would be set as device, user, or profile		* @param packageName The package of the component that would be set as device, user, or profile
	* owner.		* owner.
	* @return A {@link ProvisioningPreCondition} value indicating whether provisioning is allowed.		* @return An int constant value indicating whether provisioning is allowed.
	* @hide		* @hide
	*/		*/
	@SystemApi		@SystemApi
	@RequiresPermission(android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS)		@RequiresPermission(android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS)
	public @ProvisioningPreCondition int checkProvisioningPreCondition(		@ProvisioningPrecondition
			public int checkProvisioningPrecondition(
	@NonNull String action, @NonNull String packageName) {		@NonNull String action, @NonNull String packageName) {
	try {		try {
	return mService.checkProvisioningPreCondition(action, packageName);		return mService.checkProvisioningPrecondition(action, packageName);
	} catch (RemoteException re) {		} catch (RemoteException re) {
	throw re.rethrowFromSystemServer();		throw re.rethrowFromSystemServer();
	}		}
	@@ -14689,7 +14681,7 @@ public class DevicePolicyManager {
	* {@link ManagedProfileProvisioningParams#getProfileAdminComponentName()} as the profile		* {@link ManagedProfileProvisioningParams#getProfileAdminComponentName()} as the profile
	* owner.		* owner.
	*		*
	* <p>The method {@link #checkProvisioningPreCondition} must be returning {@link #CODE_OK}		* <p>The method {@link #checkProvisioningPrecondition} must be returning {@link #STATUS_OK}
	* before calling this method.		* before calling this method.
	*		*
	* @param provisioningParams Params required to provision a managed profile,		* @param provisioningParams Params required to provision a managed profile,
	@@ -14733,7 +14725,7 @@ public class DevicePolicyManager {
	* Provisions a managed device and sets the {@code deviceAdminComponentName} as the device		* Provisions a managed device and sets the {@code deviceAdminComponentName} as the device
	* owner.		* owner.
	*		*
	* <p>The method {@link #checkProvisioningPreCondition} must be returning {@link #CODE_OK}		* <p>The method {@link #checkProvisioningPrecondition} must be returning {@link #STATUS_OK}
	* before calling this method.		* before calling this method.
	*		*
	* @param provisioningParams Params required to provision a fully managed device,		* @param provisioningParams Params required to provision a fully managed device,

core/java/android/app/admin/IDevicePolicyManager.aidl

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -373,7 +373,7 @@ interface IDevicePolicyManager {
	String permission, int grantState, in RemoteCallback resultReceiver);		String permission, int grantState, in RemoteCallback resultReceiver);
	int getPermissionGrantState(in ComponentName admin, in String callerPackage, String packageName, String permission);		int getPermissionGrantState(in ComponentName admin, in String callerPackage, String packageName, String permission);
	boolean isProvisioningAllowed(String action, String packageName);		boolean isProvisioningAllowed(String action, String packageName);
	int checkProvisioningPreCondition(String action, String packageName);		int checkProvisioningPrecondition(String action, String packageName);
	void setKeepUninstalledPackages(in ComponentName admin, in String callerPackage, in List<String> packageList);		void setKeepUninstalledPackages(in ComponentName admin, in String callerPackage, in List<String> packageList);
	List<String> getKeepUninstalledPackages(in ComponentName admin, in String callerPackage);		List<String> getKeepUninstalledPackages(in ComponentName admin, in String callerPackage);
	boolean isManagedProfile(in ComponentName admin);		boolean isManagedProfile(in ComponentName admin);

core/java/android/app/admin/ProvisioningException.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -46,7 +46,7 @@ public class ProvisioningException extends AndroidException {
	/**		/**
	* Service-specific error code for {@link DevicePolicyManager#provisionFullyManagedDevice} and		* Service-specific error code for {@link DevicePolicyManager#provisionFullyManagedDevice} and
	* {@link DevicePolicyManager#createAndProvisionManagedProfile}:		* {@link DevicePolicyManager#createAndProvisionManagedProfile}:
	* Indicates the call to {@link DevicePolicyManager#checkProvisioningPreCondition} returned an		* Indicates the call to {@link DevicePolicyManager#checkProvisioningPrecondition} returned an
	* error code.		* error code.
	*/		*/
	public static final int ERROR_PRE_CONDITION_FAILED = 1;		public static final int ERROR_PRE_CONDITION_FAILED = 1;