diff options
| author | Dan Sandler <dsandler@android.com> | 2014-04-16 20:32:57 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-04-16 20:32:58 +0000 |
| commit | a46ceb5881ba9d0efc422713455900f06dce4537 (patch) | |
| tree | 0e14e8ed462587204d0f5bd4df5d35367c0da85b | |
| parent | 934ef05799532b75d349338c4300671cec1ab162 (diff) | |
| parent | 63e40170f8ba139b9ae67425b3c979cb4de11ea1 (diff) | |
| download | frameworks_base-a46ceb5881ba9d0efc422713455900f06dce4537.zip frameworks_base-a46ceb5881ba9d0efc422713455900f06dce4537.tar.gz frameworks_base-a46ceb5881ba9d0efc422713455900f06dce4537.tar.bz2 | |
Merge "Fix NPE if showKeyguard() is not called before hideKeyguard()."
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java | 4 |
1 files changed, 3 insertions, 1 deletions
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 e89544c..ca97049 100644 --- 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(); } |