Merge "Fix SysUIStateInteractor for lazy states of external displays" into main (dbdac02f) · Commits · e / os / android_frameworks_base

packages/SystemUI/multivalentTests/src/com/android/systemui/common/domain/interactor/SysUIStatePerDisplayInteractorTest.kt

+9 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ package com.android.systemui.common.domain.interactor
		import androidx.test.ext.junit.runners.AndroidJUnit4
		import androidx.test.filters.SmallTest
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.display.data.repository.displayRepository
		import com.android.systemui.model.StateChange
		import com.android.systemui.model.fakeSysUIStatePerDisplayRepository
		import com.android.systemui.model.sysUiStateFactory
		@@ -26,6 +27,7 @@ import com.android.systemui.model.sysuiStateInteractor
		import com.android.systemui.testKosmos
		import com.google.common.truth.Truth.assertThat
		import kotlin.test.Test
		import kotlinx.coroutines.runBlocking
		import org.junit.Before
		import org.junit.runner.RunWith

		@@ -49,6 +51,13 @@ class SysUIStatePerDisplayInteractorTest : SysuiTestCase() {
		add(1, state1)
		add(2, state2)
		}
		runBlocking {
		kosmos.displayRepository.apply {
		addDisplay(0)
		addDisplay(1)
		addDisplay(2)
		}
		}
		}

		@Test

packages/SystemUI/src/com/android/systemui/common/domain/interactor/SysUIStateDisplaysInteractor.kt

+26 −8

Original line number	Diff line number	Diff line
		@@ -16,7 +16,9 @@

		package com.android.systemui.common.domain.interactor

		import android.util.Log
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.display.data.repository.DisplayRepository
		import com.android.systemui.display.data.repository.PerDisplayRepository
		import com.android.systemui.model.StateChange
		import com.android.systemui.model.SysUiState
		@@ -26,20 +28,36 @@ import javax.inject.Inject
		@SysUISingleton
		class SysUIStateDisplaysInteractor
		@Inject
		constructor(private val sysUIStateRepository: PerDisplayRepository<SysUiState>) {
		constructor(
		private val sysUIStateRepository: PerDisplayRepository<SysUiState>,
		private val displayRepository: DisplayRepository,
		) {

		/**
		* Sets the flags on the given [targetDisplayId] based on the [stateChanges], while making sure
		* that those flags are not set in any other display.
		*/
		fun setFlagsExclusivelyToDisplay(targetDisplayId: Int, stateChanges: StateChange) {
		sysUIStateRepository.forEachInstance { displayId, instance ->
		if (displayId == targetDisplayId) {
		stateChanges.applyTo(instance)
		if (SysUiState.DEBUG) {
		Log.d(TAG, "Setting flags $stateChanges only for display $targetDisplayId")
		}
		displayRepository.displays.value
		.mapNotNull { sysUIStateRepository[it.displayId] }
		.apply {
		// Let's first modify all states, without committing changes ...
		forEach { displaySysUIState ->
		if (displaySysUIState.displayId == targetDisplayId) {
		stateChanges.applyTo(displaySysUIState)
		} else {
		stateChanges.clearAllChangedFlagsIn(instance)
		stateChanges.clearFrom(displaySysUIState)
		}
		}
		// ... And commit changes at the end
		forEach { sysuiState -> sysuiState.commitUpdate() }
		}
		}

		private companion object {
		const val TAG = "SysUIStateInteractor"
		}
		}

packages/SystemUI/src/com/android/systemui/display/data/repository/PerDisplayRepository.kt

+0 −12

Original line number	Diff line number	Diff line
		@@ -91,18 +91,6 @@ interface PerDisplayRepository<T> {

		/** Debug name for this repository, mainly for tracing and logging. */
		val debugName: String

		/**
		* Invokes the specified action on each instance held by this repository.
		*
		* The action will receive the displayId and the instance associated with that display.
		* If there is no instance for the display, the action is not called.
		*/
		fun forEachInstance(action: (Int, T) -> Unit) {
		displayIds.forEach { displayId ->
		get(displayId)?.let { instance -> action(displayId, instance) }
		}
		}
		}

		/**

packages/SystemUI/src/com/android/systemui/model/SysUIStateChange.kt

+21 −5

Original line number	Diff line number	Diff line
		@@ -16,6 +16,8 @@

		package com.android.systemui.model

		import com.android.systemui.shared.system.QuickStepContract.getSystemUiStateString

		/**
		* Represents a set of state changes. A bit can either be set to `true` or `false`.
		*
		@@ -43,13 +45,16 @@ class StateChange {

		fun hasChanges() = flagsToSet != 0L \|\| flagsToClear != 0L

		/** Applies all changed flags to [sysUiState]. */
		/**
		* Applies all changed flags to [sysUiState].
		*
		* Note this doesn't call [SysUiState.commitUpdate].
		*/
		fun applyTo(sysUiState: SysUiState) {
		iterateBits(flagsToSet or flagsToClear) { bit ->
		val isBitSetInNewState = flagsToSet and bit != 0L
		sysUiState.setFlag(bit, isBitSetInNewState)
		}
		sysUiState.commitUpdate()
		}

		fun applyTo(sysUiState: Long): Long {
		@@ -69,14 +74,25 @@ class StateChange {
		}
		}

		/** Clears all the flags changed in a [sysUiState] */
		fun clearAllChangedFlagsIn(sysUiState: SysUiState) {
		/**
		* Clears all the flags changed in a [sysUiState].
		*
		* Note this doesn't call [SysUiState.commitUpdate].
		*/
		fun clearFrom(sysUiState: SysUiState) {
		iterateBits(flagsToSet or flagsToClear) { bit -> sysUiState.setFlag(bit, false) }
		sysUiState.commitUpdate()
		}

		fun clear() {
		flagsToSet = 0
		flagsToClear = 0
		}

		override fun toString(): String {
		return """StateChange(flagsToSet=${getSystemUiStateString(flagsToSet)}, flagsToClear=${
		getSystemUiStateString(
		flagsToClear
		)
		})"""
		}
		}

packages/SystemUI/src/com/android/systemui/model/SysUiState.kt

+4 −1

Original line number	Diff line number	Diff line
		@@ -74,6 +74,9 @@ interface SysUiState : Dumpable {
		*/
		fun destroy()

		/** The display ID this instances is associated with */
		val displayId: Int

		companion object {
		const val DEBUG: Boolean = false
		}
		@@ -84,7 +87,7 @@ private const val TAG = "SysUIState"
		class SysUiStateImpl
		@AssistedInject
		constructor(
		@Assisted private val displayId: Int,
		@Assisted override val displayId: Int,
		private val sceneContainerPlugin: SceneContainerPlugin?,
		private val dumpManager: DumpManager,
		private val stateDispatcher: SysUIStateDispatcher,