Merge "Remove ExperimentalCoroutinesApi opt-ins from tests/utils/" into main (0c654543) · Commits · e / os / android_frameworks_base

packages/SystemUI/tests/utils/src/com/android/app/WallpaperManagerKosmos.kt

+0 −2

Original line number	Diff line number	Diff line
		@@ -19,9 +19,7 @@ import android.app.WallpaperManager
		import android.content.applicationContext
		import com.android.systemui.kosmos.Kosmos
		import com.android.systemui.kosmos.Kosmos.Fixture
		import kotlinx.coroutines.ExperimentalCoroutinesApi

		@OptIn(ExperimentalCoroutinesApi::class)
		val Kosmos.wallpaperManager: WallpaperManager by Fixture {
		WallpaperManager.getInstance(applicationContext)
		}

+0 −3

Original line number	Diff line number	Diff line
		@@ -51,7 +51,6 @@ import kotlin.coroutines.CoroutineContext
		import kotlin.coroutines.EmptyCoroutineContext
		import kotlinx.coroutines.CoroutineScope
		import kotlinx.coroutines.CoroutineStart
		import kotlinx.coroutines.ExperimentalCoroutinesApi
		import kotlinx.coroutines.flow.Flow
		import kotlinx.coroutines.test.TestScope
		import kotlinx.coroutines.test.runCurrent
		@@ -148,7 +147,6 @@ interface SysUITestComponent<out T> {
		val underTest: T
		}

		@OptIn(ExperimentalCoroutinesApi::class)
		fun <T : SysUITestComponent<*>> T.runTest(block: suspend T.() -> Unit): Unit =
		testScope.runTest {
		// Access underTest immediately to force Dagger to instantiate it prior to the test running
		@@ -157,7 +155,6 @@ fun <T : SysUITestComponent<*>> T.runTest(block: suspend T.() -> Unit): Unit =
		block()
		}

		@OptIn(ExperimentalCoroutinesApi::class)
		fun SysUITestComponent<*>.runCurrent() = testScope.runCurrent()

		fun <T> SysUITestComponent<*>.collectLastValue(

+0 −2

Original line number	Diff line number	Diff line
		@@ -28,7 +28,6 @@ import com.android.systemui.dagger.SysUISingleton
		import dagger.Binds
		import dagger.Module
		import dagger.Provides
		import kotlinx.coroutines.ExperimentalCoroutinesApi
		import kotlinx.coroutines.flow.MutableStateFlow
		import kotlinx.coroutines.flow.StateFlow
		import kotlinx.coroutines.flow.asStateFlow
		@@ -260,7 +259,6 @@ class FakeAuthenticationRepository(private val currentTime: () -> Long) : Authen
		}
		}

		@OptIn(ExperimentalCoroutinesApi::class)
		@Module(includes = [FakeAuthenticationRepositoryModule.Bindings::class])
		object FakeAuthenticationRepositoryModule {
		@Provides

+0 −2

Original line number	Diff line number	Diff line
		@@ -27,9 +27,7 @@ import com.android.systemui.keyguard.ui.viewmodel.sideFpsProgressBarViewModel
		import com.android.systemui.kosmos.Kosmos
		import com.android.systemui.kosmos.Kosmos.Fixture
		import com.android.systemui.kosmos.applicationCoroutineScope
		import kotlinx.coroutines.ExperimentalCoroutinesApi

		@OptIn(ExperimentalCoroutinesApi::class)
		val Kosmos.sideFpsOverlayViewBinder by Fixture {
		SideFpsOverlayViewBinder(
		applicationScope = applicationCoroutineScope,

+0 −2

Original line number	Diff line number	Diff line
		@@ -23,9 +23,7 @@ import com.android.systemui.kosmos.Kosmos
		import com.android.systemui.kosmos.Kosmos.Fixture
		import com.android.systemui.statusbar.phone.systemUIDialogManager
		import com.android.systemui.util.mockito.mock
		import kotlinx.coroutines.ExperimentalCoroutinesApi

		@ExperimentalCoroutinesApi
		val Kosmos.deviceEntryUdfpsTouchOverlayViewModel by Fixture {
		DeviceEntryUdfpsTouchOverlayViewModel(
		deviceEntryIconViewModel = deviceEntryIconViewModel,