Merge "Do not assume presence of status bar service in GlobalActions"

2017-03-23 21:38:56 +00:00
parent b202b5c35c 25a06db391
commit 45061584d5
1 changed files with 5 additions and 1 deletions
--- 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) {