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

Commit 1a0b25c3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix more kotlin nullable errors in Launcher3" into udc-dev-plus-aosp

parents 520168d7 4aef83aa
Loading
Loading
Loading
Loading
+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)