From 62bdce56b051cfc0e53dd23005d4e4ce55b2b8b4 Mon Sep 17 00:00:00 2001
From: Dan Sandler <dsandler@android.com>
Date: Tue, 23 Apr 2019 19:18:21 -0400
Subject: [PATCH] Fix crash when launching assist from power button.

Bug: 131183785
Test: adb shell settings put global power_button_long_press 5
      then longpress power button
Change-Id: I0d6c25f75efc1e0e7a04f44ba91f7603ab8f311b
---
 .../src/com/android/systemui/assist/AssistManager.java        | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java b/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java
index 1bd8e0d2ce0f0..4ed28f92d5cb8 100644
--- a/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java
+++ b/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java
@@ -180,6 +180,10 @@ public class AssistManager implements ConfigurationChangedReceiver {
                     ? TIMEOUT_SERVICE
                     : TIMEOUT_ACTIVITY);
         }
+
+        if (args == null) {
+            args = new Bundle();
+        }
         args.putLong(INVOCATION_TIME_MS_KEY, SystemClock.uptimeMillis());
         startAssistInternal(args, assistComponent, isService);
     }