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

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

Change-Id: I11a4409c09ae3b2a03fdfde2de906123fd39f8b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-09-05 21:59:43 +00:00
committed by Automerger Merge Worker
@@ -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)