Merge "Do not assume presence of status bar service in GlobalActions"
diff --git a/services/core/java/com/android/server/policy/GlobalActions.java b/services/core/java/com/android/server/policy/GlobalActions.java
index 17e5e9f..db23a6a 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 @@
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) {