Merge "Revert "[flexiglass] Move auth/bouncer work off the main thread - domain layer"" into main (e39f9c93) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/authentication/domain/interactor/AuthenticationInteractor.kt

+5 −2

Original line number	Diff line number	Diff line
		@@ -30,6 +30,7 @@ import com.android.systemui.authentication.shared.model.AuthenticationPatternCoo
		import com.android.systemui.authentication.shared.model.AuthenticationWipeModel
		import com.android.systemui.authentication.shared.model.AuthenticationWipeModel.WipeTarget
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.dagger.qualifiers.Application
		import com.android.systemui.dagger.qualifiers.Background
		import com.android.systemui.log.table.TableLogBuffer
		import com.android.systemui.log.table.logDiffsForTable
		@@ -40,6 +41,7 @@ import javax.inject.Inject
		import kotlin.math.max
		import kotlin.time.Duration
		import kotlin.time.Duration.Companion.seconds
		import kotlinx.coroutines.CoroutineDispatcher
		import kotlinx.coroutines.CoroutineScope
		import kotlinx.coroutines.delay
		import kotlinx.coroutines.flow.Flow
		@@ -63,7 +65,8 @@ import kotlinx.coroutines.flow.stateIn
		class AuthenticationInteractor
		@Inject
		constructor(
		@Background private val applicationScope: CoroutineScope,
		@Application private val applicationScope: CoroutineScope,
		@Background private val backgroundDispatcher: CoroutineDispatcher,
		private val repository: AuthenticationRepository,
		private val selectedUserInteractor: SelectedUserInteractor,
		@SceneFrameworkTableLog private val tableLogBuffer: TableLogBuffer,
		@@ -339,7 +342,7 @@ constructor(
		}

		private suspend fun initiateGarbageCollection(delay: Duration) {
		applicationScope.launch {
		applicationScope.launch(context = backgroundDispatcher) {
		delay(delay)
		System.gc()
		System.runFinalization()

packages/SystemUI/src/com/android/systemui/bouncer/domain/interactor/BouncerInteractor.kt

+2 −2

Original line number	Diff line number	Diff line
		@@ -35,7 +35,7 @@ import com.android.systemui.classifier.FalsingClassifier
		import com.android.systemui.classifier.domain.interactor.FalsingInteractor
		import com.android.systemui.common.ui.domain.interactor.ConfigurationInteractor
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.dagger.qualifiers.Background
		import com.android.systemui.dagger.qualifiers.Application
		import com.android.systemui.deviceentry.domain.interactor.ActiveUnlockInteractor
		import com.android.systemui.deviceentry.domain.interactor.DeviceEntryFaceAuthInteractor
		import com.android.systemui.log.SessionTracker
		@@ -65,7 +65,7 @@ import kotlinx.coroutines.flow.map
		class BouncerInteractor
		@Inject
		constructor(
		@Background private val applicationScope: CoroutineScope,
		@Application private val applicationScope: CoroutineScope,
		private val repository: BouncerRepository,
		private val authenticationInteractor: AuthenticationInteractor,
		private val deviceEntryFaceAuthInteractor: DeviceEntryFaceAuthInteractor,

packages/SystemUI/src/com/android/systemui/deviceentry/domain/interactor/DeviceEntryInteractor.kt

+2 −2

Original line number	Diff line number	Diff line
		@@ -21,7 +21,7 @@ import com.android.systemui.authentication.domain.interactor.AuthenticationInter
		import com.android.systemui.authentication.shared.model.AuthenticationMethodModel
		import com.android.systemui.bouncer.domain.interactor.AlternateBouncerInteractor
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.dagger.qualifiers.Background
		import com.android.systemui.dagger.qualifiers.Application
		import com.android.systemui.deviceentry.data.repository.DeviceEntryRepository
		import com.android.systemui.keyguard.DismissCallbackRegistry
		import com.android.systemui.log.table.TableLogBuffer
		@@ -59,7 +59,7 @@ import kotlinx.coroutines.launch
		class DeviceEntryInteractor
		@Inject
		constructor(
		@Background private val applicationScope: CoroutineScope,
		@Application private val applicationScope: CoroutineScope,
		private val repository: Lazy<DeviceEntryRepository>,
		private val authenticationInteractor: Lazy<AuthenticationInteractor>,
		private val sceneInteractor: Lazy<SceneInteractor>,

packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/StatusBarDisableFlagsInteractor.kt

+16 −10

Original line number	Diff line number	Diff line
		@@ -32,6 +32,7 @@ import com.android.systemui.CoreStartable
		import com.android.systemui.authentication.domain.interactor.AuthenticationInteractor
		import com.android.systemui.authentication.shared.model.AuthenticationMethodModel
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.dagger.qualifiers.Application
		import com.android.systemui.dagger.qualifiers.Background
		import com.android.systemui.deviceconfig.domain.interactor.DeviceConfigInteractor
		import com.android.systemui.deviceentry.domain.interactor.DeviceEntryFaceAuthInteractor
		@@ -46,11 +47,13 @@ import com.android.systemui.scene.shared.flag.SceneContainerFlag
		import com.android.systemui.shade.ShadeDisplayAware
		import com.android.systemui.user.domain.interactor.SelectedUserInteractor
		import javax.inject.Inject
		import kotlinx.coroutines.CoroutineDispatcher
		import kotlinx.coroutines.CoroutineScope
		import kotlinx.coroutines.flow.combine
		import kotlinx.coroutines.flow.distinctUntilChanged
		import kotlinx.coroutines.flow.flowOf
		import kotlinx.coroutines.flow.map
		import kotlinx.coroutines.withContext

		private val TAG = StatusBarDisableFlagsInteractor::class.simpleName

		@@ -64,8 +67,9 @@ private val TAG = StatusBarDisableFlagsInteractor::class.simpleName
		class StatusBarDisableFlagsInteractor
		@Inject
		constructor(
		@Background private val scope: CoroutineScope,
		@Application private val scope: CoroutineScope,
		@ShadeDisplayAware private val context: Context,
		@Background private val backgroundDispatcher: CoroutineDispatcher,
		private val deviceEntryFaceAuthInteractor: DeviceEntryFaceAuthInteractor,
		private val statusBarService: IStatusBarService,
		private val processWrapper: ProcessWrapper,
		@@ -175,6 +179,7 @@ constructor(
		return@collect
		}

		withContext(backgroundDispatcher) {
		try {
		statusBarService.disableForUser(
		flags,
		@@ -189,3 +194,4 @@ constructor(
		}
		}
		}
		}

packages/SystemUI/src/com/android/systemui/scene/domain/startable/SceneContainerStartable.kt

+6 −10

Original line number	Diff line number	Diff line
		@@ -88,10 +88,6 @@ import com.android.systemui.util.println
		import com.android.systemui.utils.coroutines.flow.conflatedCallbackFlow
		import com.google.android.msdl.data.model.MSDLToken
		import com.google.android.msdl.domain.MSDLPlayer
		import dagger.Lazy
		import java.io.PrintWriter
		import java.util.Optional
		import javax.inject.Inject
		import kotlinx.coroutines.CoroutineScope
		import kotlinx.coroutines.channels.awaitClose
		import kotlinx.coroutines.coroutineScope
		@@ -110,6 +106,10 @@ import kotlinx.coroutines.flow.map
		import kotlinx.coroutines.flow.mapNotNull
		import kotlinx.coroutines.flow.stateIn
		import kotlinx.coroutines.launch
		import dagger.Lazy
		import java.io.PrintWriter
		import java.util.Optional
		import javax.inject.Inject

		/**
		* Hooks up business logic that manipulates the state of the [SceneInteractor] for the system UI
		@@ -302,13 +302,9 @@ constructor(
		is ObservableTransitionState.Idle -> {
		if (transitionState.currentScene == Scenes.Dream) {
		false to "dream is showing"
		} else if (
		transitionState.currentScene != Scenes.Gone
		) {
		} else if (transitionState.currentScene != Scenes.Gone) {
		true to "scene is not Gone"
		} else if (
		transitionState.currentOverlays.isNotEmpty()
		) {
		} else if (transitionState.currentOverlays.isNotEmpty()) {
		true to "overlay is shown"
		} else {
		false to "scene is Gone and no overlays are shown"