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

Commit 6b3d1613 authored Jan 21, 2025 by Treehugger Robot Committed by Automerger Merge Worker Jan 21, 2025

Merge "Small fixes for Kotlin 2." into main am: d6c2e676

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3457979

Change-Id: I8c0ddc91b59a619abfbcc924c6e63c9b19dcf321
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 1c015645 d6c2e676

packages/SystemUI/tests/src/com/android/systemui/statusbar/chips/mediaprojection/domain/interactor/MediaProjectionChipInteractorTest.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -157,7 +157,7 @@ class MediaProjectionChipInteractorTest : SysuiTestCase() {
		if (
		(it.arguments[0] as Intent).`package` == CAST_TO_OTHER_DEVICES_PACKAGE
		) {
		emptyList()
		emptyList<ResolveInfo>()
		} else {
		listOf(mock<ResolveInfo>())
		}

packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/CastDeviceTest.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -63,7 +63,7 @@ class CastDeviceTest : SysuiTestCase() {
		doAnswer {
		// See Utils.isHeadlessRemoteDisplayProvider
		if ((it.arguments[0] as Intent).`package` == HEADLESS_REMOTE_PACKAGE) {
		emptyList()
		emptyList<ResolveInfo>()
		} else {
		listOf(mock<ResolveInfo>())
		}