Merge "Studio: Add explicit types to test files after Kotlin2 upgrade" into main (5e5f2e8b) · Commits · e / os / android_frameworks_base

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/DeviceControlsTileTest.kt

+3 −3

Original line number	Diff line number	Diff line
		@@ -141,7 +141,7 @@ class DeviceControlsTileTest(flags: FlagsParameterization) : SysuiTestCase() {
		if (featureEnabled) {
		Optional.of(controlsController)
		} else {
		Optional.empty()
		Optional.empty<ControlsController>()
		}
		}

		@@ -149,7 +149,7 @@ class DeviceControlsTileTest(flags: FlagsParameterization) : SysuiTestCase() {
		if (featureEnabled) {
		Optional.of(controlsListingController)
		} else {
		Optional.empty()
		Optional.empty<ControlsController>()
		}
		}

		@@ -157,7 +157,7 @@ class DeviceControlsTileTest(flags: FlagsParameterization) : SysuiTestCase() {
		if (featureEnabled) {
		Optional.of(controlsUiController)
		} else {
		Optional.empty()
		Optional.empty<ControlsController>()
		}
		}

+1 −1

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -66,7 +66,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>())
		}