Merge "Fix NPE if showKeyguard() is not called before hideKeyguard()."

2014-04-16 20:32:57 +00:00
parent 934ef05799 63e40170f8
commit a46ceb5881
1 changed files with 3 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
@@ -2965,7 +2965,9 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode {
        mStatusBarWindow.setSystemUiVisibility(0);
        mKeyguardStatusView.setVisibility(View.GONE);
        mNotificationPanelHeader.setVisibility(View.VISIBLE);
-        mKeyguardSettingsFlipButton.setVisibility(View.GONE);
+        if (mKeyguardSettingsFlipButton != null) {
+            mKeyguardSettingsFlipButton.setVisibility(View.GONE);
+        }
        updateRowStates();
    }