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

Commit 3727f5cf authored by Amith Yamasani's avatar Amith Yamasani Committed by Android Git Automerger
Browse files

am ac3ef9db: am 9c673b05: Merge "Go back to keyguard if user is switched in... 

am ac3ef9db: am 9c673b05: Merge "Go back to keyguard if user is switched in lock screen" into jb-mr1-dev

* commit 'ac3ef9db':
  Go back to keyguard if user is switched in lock screen
parents d381c620 ac3ef9db

policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewManager.java

+3 −3
Original line number Diff line number Diff line
@@ -214,9 +214,9 @@ public class KeyguardViewManager { 
     */

    public synchronized void reset() {

        if (DEBUG) Log.d(TAG, "reset()");

        if (mKeyguardView != null) {

            mKeyguardView.reset();

        }

        // User might have switched, check if we need to go back to keyguard

        // TODO: It's preferable to stay and show the correct lockscreen or unlock if none

        maybeCreateKeyguardLocked(shouldEnableScreenRotation());

    }



    public synchronized void onScreenTurnedOff() {