Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f4a0efd1 authored by Antoan Angelov's avatar Antoan Angelov
Browse files

Revert "Revert "Add STATE_USER_PROFILE_FINALIZED as an additional user state"" 

This reverts commit 7599f05c.

Reason for revert: This should be merged as part of the other pending ManagedProvisioning changes.

Bug: 161402545
Change-Id: I9ca9327540385db5b605a05ed6d0f8873cfa0de6
parent 7599f05c

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -912,6 +912,7 @@ 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

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

+11 −1
Original line number Diff line number Diff line
@@ -1829,6 +1829,15 @@ 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















     */









@@ -1837,7 +1846,8 @@ public class DevicePolicyManager {













            STATE_USER_SETUP_INCOMPLETE,















            STATE_USER_SETUP_COMPLETE,















            STATE_USER_SETUP_FINALIZED,













            STATE_USER_PROFILE_COMPLETE













            STATE_USER_PROFILE_COMPLETE,













            STATE_USER_PROFILE_FINALIZED















    })















    @Retention(RetentionPolicy.SOURCE)















    public @interface UserProvisioningState {}

































non-updatable-api/system-current.txt



+1
−0




























Original line number
Diff line number
Diff line








@@ -860,6 +860,7 @@ 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

































services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -7793,7 +7793,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_UNMANAGED) {













                if (newState == DevicePolicyManager.STATE_USER_PROFILE_FINALIZED) {















                    return;















                }















                break;

































services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java



+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_UNMANAGED);













                DevicePolicyManager.STATE_USER_PROFILE_FINALIZED);















    }































    public void testSetUserProvisioningState_managedProfileFromSetupWizard_managedProfile()