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

Commit d8953924 authored by Shreya Singh's avatar Shreya Singh Committed by Android (Google) Code Review
Browse files

Merge "Deflag `user_provisioning_same_state`." into main

parents 9e91e83d 15c44ae5

core/java/android/app/admin/flags/flags.aconfig

+0 −10
Original line number Diff line number Diff line
@@ -362,16 +362,6 @@ flag { 
    }

}



flag {

    name: "user_provisioning_same_state"

    namespace: "enterprise"

    description: "Handle exceptions while setting same provisioning state."

    bug: "326441417"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



flag {

    name: "remove_managed_profile_enabled"

    namespace: "enterprise"

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

+2 −4
Original line number Diff line number Diff line
@@ -10646,10 +10646,8 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
    }















    private void checkUserProvisioningStateTransition(int currentState, int newState) {













        if (Flags.userProvisioningSameState()) {















        Preconditions.checkState(newState != currentState, "New state cannot"















                + " be the same as the current state: [" + newState + "]");













        }















        // Valid transitions for normal use-cases.















        switch (currentState) {















            case STATE_USER_UNMANAGED: