Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Dan Sandler
2014-04-16 20:32:57 +00:00
committed by Android (Google) Code Review
parent 934ef05799 63e40170f8
commit a46ceb5881
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2965,7 +2965,9 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode {
mStatusBarWindow.setSystemUiVisibility(0); mStatusBarWindow.setSystemUiVisibility(0);
mKeyguardStatusView.setVisibility(View.GONE); mKeyguardStatusView.setVisibility(View.GONE);
mNotificationPanelHeader.setVisibility(View.VISIBLE); mNotificationPanelHeader.setVisibility(View.VISIBLE);
mKeyguardSettingsFlipButton.setVisibility(View.GONE); if (mKeyguardSettingsFlipButton != null) {
mKeyguardSettingsFlipButton.setVisibility(View.GONE);
}
updateRowStates(); updateRowStates();
} }