commit 18ec7a95be24be5a321f3def932bbd6143029bdd
author Brian Colonna <bcolonna@google.com> Wed Apr 11 15:46:34 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 11 15:46:34 2012 -0700
tree 80f875537d6ad5f6a0e6035360c41005990c7e8f
parent db13a6bf788cc48af86c8acf6f74b416dfd84199
parent c3cd2500a535aeba8e8ce2876844542829dd8e68

Merge "Fix: FUL coming up when phone is powered off from lockscreen"

policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java

diff --git a/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java b/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java
index d42f96a..39ede89 100644
--- a/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java
+++ b/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java
@@ -818,7 +818,7 @@
             if (force || mUnlockScreen == null || unlockMode != mUnlockScreenMode) {
                 boolean restartFaceLock = mFaceUnlock.stopIfRunning();
                 recreateUnlockScreen(unlockMode);
-                if (restartFaceLock || force) {
+                if (restartFaceLock) {
                     mFaceUnlock.activateIfAble(mHasOverlay);
                 }
             }