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

Commit d49386ea 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 am: 00b77ede
am: 11c5ff03

Change-Id: I649c06ea01b23db5668fa0694528cffd823b8d7b
parents aeb33eb0 11c5ff03

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

+6 −1
Original line number Diff line number Diff line
@@ -3809,7 +3809,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) {