commit 36a6ec17ba8dc655d0bd1d9bc92afb1699e3aafe
author John Wang <johnwang@google.com> Fri Jan 22 10:08:23 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jan 22 10:08:23 2010 -0800
tree a8b2360b711f281cef898cbabaad284ade722538
parent ccd5aeef0bccfa7963a3dc5d33d467a1446865f1
parent 6a5030748a0f18f58bb87dbb95d82f2eae395583

Merge "Update carrier display in lockscreen." into eclair

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);
             }
         }