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

Brian Colonna · Android (Google) Code Review · commit 18ec7a95be24 · 2012-04-11T15:46:34.000-07:00
diff --git a/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java b/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java
@@ -818,7 +818,7 @@ private void updateScreen(Mode mode, boolean force) {
             if (force || mUnlockScreen == null || unlockMode != mUnlockScreenMode) {
                 boolean restartFaceLock = mFaceUnlock.stopIfRunning();
                 recreateUnlockScreen(unlockMode);
-                if (restartFaceLock || force) {
+                if (restartFaceLock) {
                     mFaceUnlock.activateIfAble(mHasOverlay);
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -818,7 +818,7 @@ private void updateScreen(Mode mode, boolean force) {`
`818`	`818`	`if (force \|\| mUnlockScreen == null \|\| unlockMode != mUnlockScreenMode) {`
`819`	`819`	`boolean restartFaceLock = mFaceUnlock.stopIfRunning();`
`820`	`820`	`recreateUnlockScreen(unlockMode);`
`821`		`- if (restartFaceLock \|\| force) {`
	`821`	`+ if (restartFaceLock) {`
`822`	`822`	`mFaceUnlock.activateIfAble(mHasOverlay);`
`823`	`823`	`}`
`824`	`824`	`}`