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

Commit 00b77ede 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... 

Merge "DO NOT MERGE Clear calling identity before checking if user is running." into nyc-dev am: 2df7f9f9
am: c5d86736

Change-Id: I0886d46f74fec980eb8bd6c99d8b647e294bcb21
parents 6ca67f06 c5d86736

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

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


    private boolean isActivePasswordSufficientForUserLocked(

            DevicePolicyData policy, int userHandle, boolean parent) {

        final long id = Binder.clearCallingIdentity();

        try {

            enforceUserUnlocked(userHandle, parent);

        } finally {

            Binder.restoreCallingIdentity(id);

        }



        final int requiredPasswordQuality = getPasswordQuality(null, userHandle, parent);

        if (policy.mActivePasswordQuality < requiredPasswordQuality) {