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

Commit c5d86736 authored by Kenny Guy's avatar Kenny Guy Committed by android-build-merger
Browse files

Merge "DO NOT MERGE Clear calling identity before checking if user is running." into nyc-dev 

am: 2df7f9f9

Change-Id: I9ca23aa395e0120413a60174e9b7ef44d91a90b1
parents ff5be765 2df7f9f9

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

+6 −1
Original line number Original line Diff line number Diff line
@@ -3668,7 +3668,12 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 




    private boolean isActivePasswordSufficientForUserLocked(

    private boolean isActivePasswordSufficientForUserLocked(

            DevicePolicyData policy, int userHandle, boolean parent) {

            DevicePolicyData policy, int userHandle, boolean parent) {

        final long id = Binder.clearCallingIdentity();

        try {

            enforceUserUnlocked(userHandle, parent);

            enforceUserUnlocked(userHandle, parent);

        } finally {

            Binder.restoreCallingIdentity(id);

        }





        if (policy.mActivePasswordQuality < getPasswordQuality(null, userHandle, parent)

        if (policy.mActivePasswordQuality < getPasswordQuality(null, userHandle, parent)

                || policy.mActivePasswordLength < getPasswordMinimumLength(

                || policy.mActivePasswordLength < getPasswordMinimumLength(