commit 70213c4c4aac3a92a8a00002a199dab05edec320
author Colin Cross <ccross@android.com> Tue Aug 29 23:29:11 2023 +0000
committer Xin Li <delphij@google.com> Thu Mar 14 14:12:51 2024 -0700
tree 9d2f04f12c62de170468d2166b0693316b2bad02
parent e07b293994644d382bfa13ae821bd4d861e95be2

Fix more kotlin nullable errors in Launcher3

Fix kotlin nullable errors that were exposed by setting the retention
of android.annotation.NonNull and android.annotation.Nullable to
class retention.

Bug: 294110802
Test: builds
Merged-In: I88aec6fbc814be98f9ef048bbc5af889d0797970
Change-Id: I158db4f57d46606d7152a438d68e2b9f4c0014d9

quickstep/tests/src/com/android/quickstep/util/SplitSelectStateControllerTest.kt

diff --git a/quickstep/tests/src/com/android/quickstep/util/SplitSelectStateControllerTest.kt b/quickstep/tests/src/com/android/quickstep/util/SplitSelectStateControllerTest.kt
index 65542cf..0b3c0e8 100644
--- a/quickstep/tests/src/com/android/quickstep/util/SplitSelectStateControllerTest.kt
+++ b/quickstep/tests/src/com/android/quickstep/util/SplitSelectStateControllerTest.kt
@@ -144,12 +144,12 @@
             Consumer<Task> {
                 assertEquals(
                     "ComponentName package mismatched",
-                    it.key.baseIntent.component.packageName,
+                    it.key.baseIntent.component?.packageName,
                     matchingPackage
                 )
                 assertEquals(
                     "ComponentName class mismatched",
-                    it.key.baseIntent.component.className,
+                    it.key.baseIntent.component?.className,
                     matchingClass
                 )
                 assertEquals(it, groupTask1.task1)
@@ -236,12 +236,12 @@
             Consumer<Task> {
                 assertEquals(
                     "ComponentName package mismatched",
-                    it.key.baseIntent.component.packageName,
+                    it.key.baseIntent.component?.packageName,
                     matchingPackage
                 )
                 assertEquals(
                     "ComponentName class mismatched",
-                    it.key.baseIntent.component.className,
+                    it.key.baseIntent.component?.className,
                     matchingClass
                 )
                 assertEquals("userId mismatched", it.key.userId, nonPrimaryUserHandle.identifier)
@@ -288,12 +288,12 @@
             Consumer<Task> {
                 assertEquals(
                     "ComponentName package mismatched",
-                    it.key.baseIntent.component.packageName,
+                    it.key.baseIntent.component?.packageName,
                     matchingPackage
                 )
                 assertEquals(
                     "ComponentName class mismatched",
-                    it.key.baseIntent.component.className,
+                    it.key.baseIntent.component?.className,
                     matchingClass
                 )
                 assertEquals(it, groupTask2.task2)