Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5a7cfbda authored by Colin Cross's avatar Colin Cross Committed by Cherrypicker Worker
Browse files

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
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:4aef83aa32df00c3d3e7c4cc239a08299c3b7d7d)
Merged-In: I158db4f57d46606d7152a438d68e2b9f4c0014d9
Change-Id: I158db4f57d46606d7152a438d68e2b9f4c0014d9
parent 841dfad3

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

+6 −6
Original line number Original line Diff line number Diff line
@@ -144,12 +144,12 @@ class SplitSelectStateControllerTest { 
            Consumer<Task> {

            Consumer<Task> {

                assertEquals(

                assertEquals(

                    "ComponentName package mismatched",

                    "ComponentName package mismatched",

                    it.key.baseIntent.component.packageName,

                    it.key.baseIntent.component?.packageName,

                    matchingPackage

                    matchingPackage

                )

                )

                assertEquals(

                assertEquals(

                    "ComponentName class mismatched",

                    "ComponentName class mismatched",

                    it.key.baseIntent.component.className,

                    it.key.baseIntent.component?.className,

                    matchingClass

                    matchingClass

                )

                )

                assertEquals(it, groupTask1.task1)

                assertEquals(it, groupTask1.task1)
@@ -236,12 +236,12 @@ class SplitSelectStateControllerTest { 
            Consumer<Task> {

            Consumer<Task> {

                assertEquals(

                assertEquals(

                    "ComponentName package mismatched",

                    "ComponentName package mismatched",

                    it.key.baseIntent.component.packageName,

                    it.key.baseIntent.component?.packageName,

                    matchingPackage

                    matchingPackage

                )

                )

                assertEquals(

                assertEquals(

                    "ComponentName class mismatched",

                    "ComponentName class mismatched",

                    it.key.baseIntent.component.className,

                    it.key.baseIntent.component?.className,

                    matchingClass

                    matchingClass

                )

                )

                assertEquals("userId mismatched", it.key.userId, nonPrimaryUserHandle.identifier)

                assertEquals("userId mismatched", it.key.userId, nonPrimaryUserHandle.identifier)
@@ -288,12 +288,12 @@ class SplitSelectStateControllerTest { 
            Consumer<Task> {

            Consumer<Task> {

                assertEquals(

                assertEquals(

                    "ComponentName package mismatched",

                    "ComponentName package mismatched",

                    it.key.baseIntent.component.packageName,

                    it.key.baseIntent.component?.packageName,

                    matchingPackage

                    matchingPackage

                )

                )

                assertEquals(

                assertEquals(

                    "ComponentName class mismatched",

                    "ComponentName class mismatched",

                    it.key.baseIntent.component.className,

                    it.key.baseIntent.component?.className,

                    matchingClass

                    matchingClass

                )

                )

                assertEquals(it, groupTask2.task2)

                assertEquals(it, groupTask2.task2)