From aba08754228eeb07efcefdee47a9905706e4201b Mon Sep 17 00:00:00 2001
From: Rich Cannings <richc@google.com>
Date: Tue, 11 Nov 2008 15:12:25 +0900
Subject: [PATCH] Fix the lock screen bypass issue reported in
 http://forum.xda-developers.com/showthread.php?t=436767.

---
 .../android/internal/policy/impl/PhoneWindowManager.java   | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/policy/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/com/android/internal/policy/impl/PhoneWindowManager.java
index 250d2d40e5318..17312062960e0 100644
--- a/policy/com/android/internal/policy/impl/PhoneWindowManager.java
+++ b/policy/com/android/internal/policy/impl/PhoneWindowManager.java
@@ -1325,11 +1325,10 @@ public class PhoneWindowManager implements WindowManagerPolicy {
                 // If the user is holding the menu key code, then we are
                 // going to boot into safe mode.
                 ActivityManagerNative.getDefault().enterSafeMode();
-            } else {
-                // tell the keyguard
-                mKeyguardMediator.onSystemReady();
-                android.os.SystemProperties.set("dev.bootcomplete", "1"); 
             }
+            // tell the keyguard
+            mKeyguardMediator.onSystemReady();
+            android.os.SystemProperties.set("dev.bootcomplete", "1"); 
         } catch (RemoteException e) {
             // Ignore
         }