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

Merge commit 'ccd5aeef0bccfa7963a3dc5d33d467a1446865f1' into eclair-plus-aosp

* commit 'ccd5aeef0bccfa7963a3dc5d33d467a1446865f1':
  Workaround for a keyguard problem that appeared in the in call screen.

1 files changed, 2 insertions, 2 deletions

diff --git a/phone/com/android/internal/policy/impl/PhoneWindowManager.java b/phone/com/android/internal/policy/impl/PhoneWindowManager.java
index cdf51ed..30f0d2d 100755
--- a/phone/com/android/internal/policy/impl/PhoneWindowManager.java
+++ b/phone/com/android/internal/policy/impl/PhoneWindowManager.java
@@ -1450,18 +1450,18 @@ public class PhoneWindowManager implements WindowManagerPolicy {
                 }
             } 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);
             }
         }