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

Commit 53d57df5 authored by Jonathan Scott's avatar Jonathan Scott Committed by Automerger Merge Worker
Browse files

Merge "Use userId instead of USER_CURRENT in shouldLockKeyguard." into sc-dev am: 9c302594 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13453973

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib0c9dc4bd22707324c4ba2c2fbc1bbe8febff9bc
parents 1a56d9de 9c302594

services/core/java/com/android/server/wm/LockTaskController.java

+5 −5
Original line number Diff line number Diff line
@@ -540,7 +540,7 @@ public class LockTaskController { 
            setStatusBarState(mLockTaskModeState, userId);

            setKeyguardState(mLockTaskModeState, userId);

            if (oldLockTaskModeState == LOCK_TASK_MODE_PINNED) {

                lockKeyguardIfNeeded();

                lockKeyguardIfNeeded(userId);

            }

            if (getDevicePolicyManager() != null) {

                getDevicePolicyManager().notifyLockTaskModeChanged(false, null, userId);
@@ -886,15 +886,15 @@ public class LockTaskController { 
     * Helper method for locking the device immediately. This may be necessary when the device

     * leaves the pinned mode.

     */

    private void lockKeyguardIfNeeded() {

        if (shouldLockKeyguard()) {

    private void lockKeyguardIfNeeded(int userId) {

        if (shouldLockKeyguard(userId)) {

            mWindowManager.lockNow(null);

            mWindowManager.dismissKeyguard(null /* callback */, null /* message */);

            getLockPatternUtils().requireCredentialEntry(USER_ALL);

        }

    }



    private boolean shouldLockKeyguard() {

    private boolean shouldLockKeyguard(int userId) {

        // This functionality should be kept consistent with

        // com.android.settings.security.ScreenPinningSettings (see b/127605586)

        try {
@@ -904,7 +904,7 @@ public class LockTaskController { 
        } catch (Settings.SettingNotFoundException e) {

            // Log to SafetyNet for b/127605586

            android.util.EventLog.writeEvent(0x534e4554, "127605586", -1, "");

            return getLockPatternUtils().isSecure(USER_CURRENT);

            return getLockPatternUtils().isSecure(userId);

        }

    }

services/tests/wmtests/src/com/android/server/wm/LockTaskControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -454,7 +454,7 @@ public class LockTaskControllerTest { 
        Settings.Secure.clearProviderForTest();



        // AND a password is set

        when(mLockPatternUtils.isSecure(anyInt()))

        when(mLockPatternUtils.isSecure(TEST_USER_ID))

                .thenReturn(true);



        // AND there is a task record