From d979dd7fbcf053cdb4fa5691dc625d2dfa4071f5 Mon Sep 17 00:00:00 2001
From: Amith Yamasani <yamasani@google.com>
Date: Tue, 11 Sep 2012 15:53:37 -0700
Subject: [PATCH] Go back to keyguard if user is switched in lock screen

This is not the preferred solution, but at least it is not incorrect.

Bug: 7144478
Change-Id: Iec26723b21ff5c64546d57f9d8744a3bf2929862
---
 .../internal/policy/impl/keyguard/KeyguardViewManager.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewManager.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewManager.java
index 61003bf1136ee..d9088e00585cd 100644
--- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewManager.java
+++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewManager.java
@@ -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() {