Merge "Add STATE_USER_PROFILE_FINALIZED as an additional user state" (9810e057) · Commits · e / os / android_frameworks_base

api/system-current.txt

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -916,6 +916,7 @@ package android.app.admin {
	field public static final int PROVISIONING_TRIGGER_QR_CODE = 2; // 0x2		field public static final int PROVISIONING_TRIGGER_QR_CODE = 2; // 0x2
	field public static final int PROVISIONING_TRIGGER_UNSPECIFIED = 0; // 0x0		field public static final int PROVISIONING_TRIGGER_UNSPECIFIED = 0; // 0x0
	field public static final int STATE_USER_PROFILE_COMPLETE = 4; // 0x4		field public static final int STATE_USER_PROFILE_COMPLETE = 4; // 0x4
			field public static final int STATE_USER_PROFILE_FINALIZED = 5; // 0x5
	field public static final int STATE_USER_SETUP_COMPLETE = 2; // 0x2		field public static final int STATE_USER_SETUP_COMPLETE = 2; // 0x2
	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

+11 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1829,6 +1829,15 @@ public class DevicePolicyManager {
	@SystemApi		@SystemApi
	public static final int STATE_USER_PROFILE_COMPLETE = 4;		public static final int STATE_USER_PROFILE_COMPLETE = 4;

			/**
			* Management setup on a managed profile.
			* <p>This is used as an intermediate state after {@link #STATE_USER_PROFILE_COMPLETE} once the
			* work profile has been created.
			* @hide
			*/
			@SystemApi
			public static final int STATE_USER_PROFILE_FINALIZED = 5;

	/**		/**
	* @hide		* @hide
	*/		*/
	@@ -1837,7 +1846,8 @@ public class DevicePolicyManager {
	STATE_USER_SETUP_INCOMPLETE,		STATE_USER_SETUP_INCOMPLETE,
	STATE_USER_SETUP_COMPLETE,		STATE_USER_SETUP_COMPLETE,
	STATE_USER_SETUP_FINALIZED,		STATE_USER_SETUP_FINALIZED,
	STATE_USER_PROFILE_COMPLETE		STATE_USER_PROFILE_COMPLETE,
			STATE_USER_PROFILE_FINALIZED
	})		})
	@Retention(RetentionPolicy.SOURCE)		@Retention(RetentionPolicy.SOURCE)
	public @interface UserProvisioningState {}		public @interface UserProvisioningState {}

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -864,6 +864,7 @@ package android.app.admin {
	field public static final int PROVISIONING_TRIGGER_QR_CODE = 2; // 0x2		field public static final int PROVISIONING_TRIGGER_QR_CODE = 2; // 0x2
	field public static final int PROVISIONING_TRIGGER_UNSPECIFIED = 0; // 0x0		field public static final int PROVISIONING_TRIGGER_UNSPECIFIED = 0; // 0x0
	field public static final int STATE_USER_PROFILE_COMPLETE = 4; // 0x4		field public static final int STATE_USER_PROFILE_COMPLETE = 4; // 0x4
			field public static final int STATE_USER_PROFILE_FINALIZED = 5; // 0x5
	field public static final int STATE_USER_SETUP_COMPLETE = 2; // 0x2		field public static final int STATE_USER_SETUP_COMPLETE = 2; // 0x2
	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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -7887,7 +7887,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
	// Current user has a managed-profile, but current user is not managed, so		// Current user has a managed-profile, but current user is not managed, so
	// rather than moving to finalized state, go back to unmanaged once		// rather than moving to finalized state, go back to unmanaged once
	// profile provisioning is complete.		// profile provisioning is complete.
	if (newState == DevicePolicyManager.STATE_USER_UNMANAGED) {		if (newState == DevicePolicyManager.STATE_USER_PROFILE_FINALIZED) {
	return;		return;
	}		}
	break;		break;

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2814,7 +2814,7 @@ public class DevicePolicyManagerTest extends DpmTestBase {

	exerciseUserProvisioningTransitions(CALLER_USER_HANDLE,		exerciseUserProvisioningTransitions(CALLER_USER_HANDLE,
	DevicePolicyManager.STATE_USER_PROFILE_COMPLETE,		DevicePolicyManager.STATE_USER_PROFILE_COMPLETE,
	DevicePolicyManager.STATE_USER_UNMANAGED);		DevicePolicyManager.STATE_USER_PROFILE_FINALIZED);
	}		}

	public void testSetUserProvisioningState_managedProfileFromSetupWizard_managedProfile()		public void testSetUserProvisioningState_managedProfileFromSetupWizard_managedProfile()