commit ccd5aeef0bccfa7963a3dc5d33d467a1446865f1
author Mike Lockwood <lockwood@android.com> Thu Jan 21 16:38:44 2010 -0500
committer Mike Lockwood <lockwood@android.com> Thu Jan 21 16:38:44 2010 -0500
tree 86f552b28b05efe833fd5cb53fcc99f9ff13dd6f
parent a3b4a8111c47852e212032008732e143636151e4

Workaround for a keyguard problem that appeared in the in call screen.

While in call, pressing the power key to turn off the screen caused the Home button
to no longer work after rewaking the screen due to the KeyguardViewMediator mHidden flag not being set.

Change-Id: I322317671b2e5e32de23ed524f6e4808b0334c12
BUG: 2382766

Signed-off-by: Mike Lockwood <lockwood@android.com>

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

diff --git a/phone/com/android/internal/policy/impl/PhoneWindowManager.java b/phone/com/android/internal/policy/impl/PhoneWindowManager.java
index 27278e0..7be15e2 100755
--- a/phone/com/android/internal/policy/impl/PhoneWindowManager.java
+++ b/phone/com/android/internal/policy/impl/PhoneWindowManager.java
@@ -1450,18 +1450,18 @@
                 }
             } else if (mHideLockScreen) {
                 if (mKeyguard.hideLw(false)) {
-                    mKeyguardMediator.setHidden(true);
                     changes |= FINISH_LAYOUT_REDO_LAYOUT
                             | FINISH_LAYOUT_REDO_CONFIG
                             | FINISH_LAYOUT_REDO_WALLPAPER;
                 }
+                mKeyguardMediator.setHidden(true);
             } else {
                 if (mKeyguard.showLw(false)) {
-                    mKeyguardMediator.setHidden(false);
                     changes |= FINISH_LAYOUT_REDO_LAYOUT
                             | FINISH_LAYOUT_REDO_CONFIG
                             | FINISH_LAYOUT_REDO_WALLPAPER;
                 }
+                mKeyguardMediator.setHidden(false);
             }
         }