From 91fdf160c51e6fea1cf2f58615830bba48cbfdd1 Mon Sep 17 00:00:00 2001 From: Jon Spivack Date: Wed, 4 Aug 2021 19:17:44 -0700 Subject: NIU Actions: Handle null default assistant This handles the case where Settings.Secure.ASSISTANT is null, which occurs when config_defaultAssistant is not set at build time. Bug: 195600539 Test: Manual (built locally without config_defaultAssistant) Test: b/195681795 Change-Id: Ie8da67be5f448847c07438a25b12e8b5b2022f05 --- go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'go') diff --git a/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java b/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java index 91cab3cbd6..99238f0399 100644 --- a/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java +++ b/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java @@ -253,7 +253,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 -- cgit v1.2.3