diff options
| author | Brian Colonna <bcolonna@google.com> | 2012-04-11 15:46:34 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-11 15:46:34 -0700 |
| commit | 18ec7a95be24be5a321f3def932bbd6143029bdd (patch) | |
| tree | 80f875537d6ad5f6a0e6035360c41005990c7e8f /policy/src | |
| parent | db13a6bf788cc48af86c8acf6f74b416dfd84199 (diff) | |
| parent | c3cd2500a535aeba8e8ce2876844542829dd8e68 (diff) | |
| download | frameworks_base-18ec7a95be24be5a321f3def932bbd6143029bdd.zip frameworks_base-18ec7a95be24be5a321f3def932bbd6143029bdd.tar.gz frameworks_base-18ec7a95be24be5a321f3def932bbd6143029bdd.tar.bz2 | |
Merge "Fix: FUL coming up when phone is powered off from lockscreen"
Diffstat (limited to 'policy/src')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ public class LockPatternKeyguardView extends KeyguardViewBase { if (force || mUnlockScreen == null || unlockMode != mUnlockScreenMode) { boolean restartFaceLock = mFaceUnlock.stopIfRunning(); recreateUnlockScreen(unlockMode); - if (restartFaceLock || force) { + if (restartFaceLock) { mFaceUnlock.activateIfAble(mHasOverlay); } } |