commit 65b105bdeee71badc47a7703cd97297a699ddae5
author Jon Spivack <spivack@google.com> Thu Aug 05 21:38:49 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 05 21:38:49 2021 +0000
tree 5b67de9ebd1d5dc703e67aef2793c0cd8e91c93a
parent df9bcfada746e80fcd9f8b51384e85446d2d1a46
parent 91fdf160c51e6fea1cf2f58615830bba48cbfdd1

Merge "NIU Actions: Handle null default assistant"

go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java

diff --git a/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java b/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java
index c91137e..6502526 100644
--- a/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java
+++ b/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java
@@ -255,7 +255,11 @@
 
             String assistantPackage =
                     Settings.Secure.getString(contentResolver, Settings.Secure.ASSISTANT);
-            mNIUPackageName = assistantPackage.split("/", 2)[0];
+            if (!TextUtils.isEmpty(assistantPackage)) {
+                mNIUPackageName = assistantPackage.split("/", 2)[0];
+            } else {
+                mNIUPackageName = "";
+            }
         }
 
         protected class OverlayUICallbacksGoImpl extends OverlayUICallbacksImpl