From 25a06db3911c966206a0f3cde4aa8ed8fd1f74e1 Mon Sep 17 00:00:00 2001 From: Erik Wolsheimer Date: Thu, 23 Mar 2017 12:56:57 -0700 Subject: [PATCH] Do not assume presence of status bar service in GlobalActions Bug: 36530618 Change-Id: I5f94fe52a5814b22f433fabefad2f509bf713d13 --- .../core/java/com/android/server/policy/GlobalActions.java | 6 +++++- 1 file changed, 5 insertions(+), 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 17e5e9f0fe69d..db23a6ac8305e 100644 --- a/services/core/java/com/android/server/policy/GlobalActions.java +++ b/services/core/java/com/android/server/policy/GlobalActions.java @@ -43,7 +43,11 @@ class GlobalActions implements GlobalActionsListener { mLegacyGlobalActions = new LegacyGlobalActions(context, windowManagerFuncs, this::onGlobalActionsDismissed); mStatusBarInternal = LocalServices.getService(StatusBarManagerInternal.class); - mStatusBarInternal.setGlobalActionsListener(this); + + // Some form factors do not have a status bar. + if (mStatusBarInternal != null) { + mStatusBarInternal.setGlobalActionsListener(this); + } } public void showDialog(boolean keyguardShowing, boolean deviceProvisioned) {