From 4aef83aa32df00c3d3e7c4cc239a08299c3b7d7d Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Tue, 29 Aug 2023 23:29:11 +0000
Subject: [PATCH] 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/util/SplitSelectStateControllerTest.kt | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/quickstep/tests/src/com/android/quickstep/util/SplitSelectStateControllerTest.kt b/quickstep/tests/src/com/android/quickstep/util/SplitSelectStateControllerTest.kt
index 65542cf71b..0b3c0e8945 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 @@ class SplitSelectStateControllerTest {
             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 @@ class SplitSelectStateControllerTest {
             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 @@ class SplitSelectStateControllerTest {
             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)