commit aba08754228eeb07efcefdee47a9905706e4201b
author Rich Cannings <richc@google.com> Tue Nov 11 15:12:25 2008 +0900
committer Rich Cannings <richc@google.com> Tue Nov 11 15:12:25 2008 +0900
tree 00d7da55b3d85a22f0e188c439f095455014464c
parent e5ed42d1bc9281d35d998d976835f93a6c8cffe6

Fix the lock screen bypass issue reported in http://forum.xda-developers.com/showthread.php?t=436767.

policy/com/android/internal/policy/impl/PhoneWindowManager.java

diff --git a/policy/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/com/android/internal/policy/impl/PhoneWindowManager.java
index 250d2d4..1731206 100644
--- a/policy/com/android/internal/policy/impl/PhoneWindowManager.java
+++ b/policy/com/android/internal/policy/impl/PhoneWindowManager.java
@@ -1325,11 +1325,10 @@
                 // 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
         }