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

Commit 0d703e4a authored by Adrian Roos's avatar Adrian Roos Committed by Android (Google) Code Review
Browse files

Merge "Trust Agents: Disable until next unlock if device is locked by DPM"

parents dded065c ef1de651

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

+6 −2
Original line number Diff line number Diff line
@@ -2255,9 +2255,12 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
        try {

            LockPatternUtils utils = new LockPatternUtils(mContext);

            utils.saveLockPassword(password, quality, false, userHandle);

            boolean requireEntry = (flags & DevicePolicyManager.RESET_PASSWORD_REQUIRE_ENTRY) != 0;

            if (requireEntry) {

                utils.requireCredentialEntry(UserHandle.USER_ALL);

            }

            synchronized (this) {

                int newOwner = (flags&DevicePolicyManager.RESET_PASSWORD_REQUIRE_ENTRY)

                        != 0 ? callingUid : -1;

                int newOwner = requireEntry ? callingUid : -1;

                if (policy.mPasswordOwner != newOwner) {

                    policy.mPasswordOwner = newOwner;

                    saveSettingsLocked(userHandle);
@@ -2370,6 +2373,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
            getIPowerManager().goToSleep(SystemClock.uptimeMillis(),

                    PowerManager.GO_TO_SLEEP_REASON_DEVICE_ADMIN, 0);

            // Ensure the device is locked

            new LockPatternUtils(mContext).requireCredentialEntry(UserHandle.USER_ALL);

            getWindowManager().lockNow(null);

        } catch (RemoteException e) {

        } finally {