diff options
| author | Jon Spivack <spivack@google.com> | 2021-08-04 19:17:44 -0700 |
|---|---|---|
| committer | Jon Spivack <spivack@google.com> | 2021-08-05 20:42:12 +0000 |
| commit | 91fdf160c51e6fea1cf2f58615830bba48cbfdd1 (patch) | |
| tree | 76199357ffdd7b5dfa036d0580729a0bba46f10e /go | |
| parent | 75966cb1f752154d1f444f7f7db426ed2da33147 (diff) | |
| download | Launcher3-91fdf160c51e6fea1cf2f58615830bba48cbfdd1.tar.gz | |
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
Diffstat (limited to 'go')
| -rw-r--r-- | go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java | 6 |
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 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 |