From 72f8b5249d3c3f9d376f97aeac9b08ed0f9b5ae7 Mon Sep 17 00:00:00 2001 From: Calvin On Date: Fri, 10 Nov 2017 11:19:59 -0800 Subject: [PATCH] Fix NPE for devices without StatusBar implementation. Bug: 68949061 Change-Id: I025ea812b7fed79c4c22b1c68b4fe3ea17300be1 --- services/core/java/com/android/server/policy/GlobalActions.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/policy/GlobalActions.java b/services/core/java/com/android/server/policy/GlobalActions.java index 7a2e630cfdacd..3707a5edb3c1d 100644 --- a/services/core/java/com/android/server/policy/GlobalActions.java +++ b/services/core/java/com/android/server/policy/GlobalActions.java @@ -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;