Merge "Fix NPE for devices without StatusBar implementation."

This commit is contained in:
TreeHugger Robot
2017-11-10 21:30:32 +00:00
committed by Android (Google) Code Review

View File

@@ -58,7 +58,7 @@ class GlobalActions implements GlobalActionsListener {
public void showDialog(boolean keyguardShowing, boolean deviceProvisioned) {
if (DEBUG) Slog.d(TAG, "showDialog " + keyguardShowing + " " + deviceProvisioned);
if (mStatusBarInternal.isGlobalActionsDisabled()) {
if (mStatusBarInternal != null && mStatusBarInternal.isGlobalActionsDisabled()) {
return;
}
mKeyguardShowing = keyguardShowing;