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

Commit 5df718b3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix more kotlin nullable errors in Launcher3" into udc-dev-plus-aosp am: 1a0b25c3 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24593180



Change-Id: I11a4409c09ae3b2a03fdfde2de906123fd39f8b1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 53971980 1a0b25c3

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

+6 −6
Original line number Diff line number Diff line
@@ -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)