Merge "Revert "Add STATE_USER_PROFILE_FINALIZED as an additional user state"" (764a15f7) · Commits · e / os / android_frameworks_base

api/system-current.txt

+0 −1

Original line number	Diff line number	Diff line
		@@ -917,7 +917,6 @@ package android.app.admin {
		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 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_FINALIZED = 3; // 0x3
		field public static final int STATE_USER_SETUP_INCOMPLETE = 1; // 0x1

+1 −11

Original line number	Diff line number	Diff line
		@@ -1829,15 +1829,6 @@ public class DevicePolicyManager {
		@SystemApi
		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
		*/
		@@ -1846,8 +1837,7 @@ public class DevicePolicyManager {
		STATE_USER_SETUP_INCOMPLETE,
		STATE_USER_SETUP_COMPLETE,
		STATE_USER_SETUP_FINALIZED,
		STATE_USER_PROFILE_COMPLETE,
		STATE_USER_PROFILE_FINALIZED
		STATE_USER_PROFILE_COMPLETE
		})
		@Retention(RetentionPolicy.SOURCE)
		public @interface UserProvisioningState {}

+0 −1

Original line number	Diff line number	Diff line
		@@ -865,7 +865,6 @@ package android.app.admin {
		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 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_FINALIZED = 3; // 0x3
		field public static final int STATE_USER_SETUP_INCOMPLETE = 1; // 0x1

+1 −1

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

+1 −1

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

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

		public void testSetUserProvisioningState_managedProfileFromSetupWizard_managedProfile()