summaryrefslogtreecommitdiff
path: root/go
diff options
context:
space:
mode:
authorJon Spivack <spivack@google.com>2021-08-05 21:38:49 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2021-08-05 21:38:49 +0000
commit65b105bdeee71badc47a7703cd97297a699ddae5 (patch)
tree5b67de9ebd1d5dc703e67aef2793c0cd8e91c93a /go
parentdf9bcfada746e80fcd9f8b51384e85446d2d1a46 (diff)
parent91fdf160c51e6fea1cf2f58615830bba48cbfdd1 (diff)
downloadLauncher3-65b105bdeee71badc47a7703cd97297a699ddae5.tar.gz
Merge "NIU Actions: Handle null default assistant"
Diffstat (limited to 'go')
-rw-r--r--go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java b/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java
index c91137e0f7..6502526dcc 100644
--- a/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java
+++ b/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java
@@ -255,7 +255,11 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
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