commit 63e40170f8ba139b9ae67425b3c979cb4de11ea1
author Dan Sandler <dsandler@android.com> Wed Apr 16 16:22:56 2014 -0400
committer Dan Sandler <dsandler@android.com> Wed Apr 16 16:22:56 2014 -0400
tree d75f74139c447462a0bdce3f5dbff61acc05e3e5
parent 14a6d6826cc6253ecd036281a0ede597c8b5bf75

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

Bug: 14112212
Change-Id: Iced1085cf7be8d827cf7e34efe603a399f456c1b

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
index 1d01f91..39e39f6 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
@@ -2846,7 +2846,9 @@
         mStatusBarWindow.setSystemUiVisibility(0);
         mKeyguardStatusView.setVisibility(View.GONE);
         mNotificationPanelHeader.setVisibility(View.VISIBLE);
-        mKeyguardSettingsFlipButton.setVisibility(View.GONE);
+        if (mKeyguardSettingsFlipButton != null) {
+            mKeyguardSettingsFlipButton.setVisibility(View.GONE);
+        }
         updateRowStates();
     }