Merge "Move DisplayRepository from SystemUI to displaylib" into main (8256af94) · Commits · e / os / android_frameworks_base

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

+14 −7

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@ import android.view.Display.TYPE_INTERNAL
		import android.view.IWindowManager
		import androidx.test.ext.junit.runners.AndroidJUnit4
		import androidx.test.filters.SmallTest
		import com.android.app.displaylib.DisplayRepository.PendingDisplay
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.coroutines.FlowValue
		import com.android.systemui.coroutines.collectLastValue
		@@ -71,14 +72,20 @@ class DisplayRepositoryTest : SysuiTestCase() {
		// that the initial state (soon after construction) contains the expected ones set in every
		// test.
		private val displayRepository: DisplayRepositoryImpl by lazy {
		DisplayRepositoryImpl(
		// TODO b/401305290 - move this to kosmos
		val displayRepositoryFromLib =
		com.android.app.displaylib.DisplayRepositoryImpl(
		displayManager,
		commandQueue,
		windowManager,
		testHandler,
		TestScope(UnconfinedTestDispatcher()),
		testScope.backgroundScope,
		UnconfinedTestDispatcher(),
		)
		DisplayRepositoryImpl(
		commandQueue,
		windowManager,
		testScope.backgroundScope,
		displayRepositoryFromLib,
		)
		.also {
		verify(displayManager, never()).registerDisplayListener(any(), any())
		// It needs to be called, just once, for the initial value.
		@@ -403,7 +410,7 @@ class DisplayRepositoryTest : SysuiTestCase() {
		val pendingDisplay by lastPendingDisplay()

		sendOnDisplayConnected(1, TYPE_EXTERNAL)
		val initialPendingDisplay: DisplayRepository.PendingDisplay? = pendingDisplay
		val initialPendingDisplay: PendingDisplay? = pendingDisplay
		assertThat(pendingDisplay).isNotNull()
		sendOnDisplayChanged(1)

		@@ -416,7 +423,7 @@ class DisplayRepositoryTest : SysuiTestCase() {
		val pendingDisplay by lastPendingDisplay()

		sendOnDisplayConnected(1, TYPE_EXTERNAL)
		val initialPendingDisplay: DisplayRepository.PendingDisplay? = pendingDisplay
		val initialPendingDisplay: PendingDisplay? = pendingDisplay
		assertThat(pendingDisplay).isNotNull()
		sendOnDisplayConnected(2, TYPE_EXTERNAL)

		@@ -648,7 +655,7 @@ class DisplayRepositoryTest : SysuiTestCase() {
		return flowValue
		}

		private fun TestScope.lastPendingDisplay(): FlowValue<DisplayRepository.PendingDisplay?> {
		private fun TestScope.lastPendingDisplay(): FlowValue<PendingDisplay?> {
		val flowValue = collectLastValue(displayRepository.pendingDisplay)
		captureAddedRemovedListener()
		verify(displayManager)

packages/SystemUI/src/com/android/systemui/display/DisplayModule.kt

+17 −2

Original line number	Diff line number	Diff line
		@@ -16,10 +16,13 @@

		package com.android.systemui.display

		import android.hardware.display.DisplayManager
		import android.os.Handler
		import com.android.app.displaylib.DisplayLibComponent
		import com.android.app.displaylib.createDisplayLibComponent
		import com.android.systemui.CoreStartable
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.dagger.qualifiers.Background
		import com.android.systemui.display.data.repository.DeviceStateRepository
		import com.android.systemui.display.data.repository.DeviceStateRepositoryImpl
		import com.android.systemui.display.data.repository.DisplayRepository
		@@ -42,6 +45,8 @@ import dagger.Module
		import dagger.Provides
		import dagger.multibindings.ClassKey
		import dagger.multibindings.IntoMap
		import kotlinx.coroutines.CoroutineDispatcher
		import kotlinx.coroutines.CoroutineScope

		/** Module binding display related classes. */
		@Module(includes = [DisplayWindowPropertiesInteractorModule::class, DisplayLibModule::class])
		@@ -111,8 +116,18 @@ interface DisplayModule {
		object DisplayLibModule {
		@Provides
		@SysUISingleton
		fun displayLibComponent(): DisplayLibComponent {
		return createDisplayLibComponent()
		fun displayLibComponent(
		displayManager: DisplayManager,
		@Background backgroundHandler: Handler,
		@Background bgApplicationScope: CoroutineScope,
		@Background backgroundCoroutineDispatcher: CoroutineDispatcher,
		): DisplayLibComponent {
		return createDisplayLibComponent(
		displayManager,
		backgroundHandler,
		bgApplicationScope,
		backgroundCoroutineDispatcher,
		)
		}

		@Provides

packages/SystemUI/src/com/android/systemui/display/data/DisplayEvent.kt

deleted100644 → 0

+0 −24

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2023 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.systemui.display.data

		sealed interface DisplayEvent {
		val displayId: Int
		data class Added(override val displayId: Int) : DisplayEvent
		data class Removed(override val displayId: Int) : DisplayEvent
		data class Changed(override val displayId: Int) : DisplayEvent
		}

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

+2 −392

Original line number	Diff line number	Diff line
		@@ -17,106 +17,30 @@
		package com.android.systemui.display.data.repository

		import android.annotation.SuppressLint
		import android.hardware.display.DisplayManager
		import android.hardware.display.DisplayManager.DISPLAY_CATEGORY_ALL_INCLUDING_DISABLED
		import android.hardware.display.DisplayManager.DisplayListener
		import android.hardware.display.DisplayManager.EVENT_TYPE_DISPLAY_ADDED
		import android.hardware.display.DisplayManager.EVENT_TYPE_DISPLAY_CHANGED
		import android.hardware.display.DisplayManager.EVENT_TYPE_DISPLAY_REMOVED
		import android.os.Handler
		import android.util.Log
		import android.view.Display
		import android.view.IWindowManager
		import com.android.app.displaylib.DisplayRepository as DisplayRepositoryFromLib
		import com.android.app.tracing.FlowTracing.traceEach
		import com.android.app.tracing.traceSection
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.dagger.qualifiers.Background
		import com.android.systemui.display.data.DisplayEvent
		import com.android.systemui.statusbar.CommandQueue
		import com.android.systemui.util.Compile
		import com.android.systemui.util.kotlin.pairwiseBy
		import com.android.systemui.utils.coroutines.flow.conflatedCallbackFlow
		import javax.inject.Inject
		import kotlinx.coroutines.CoroutineDispatcher
		import kotlinx.coroutines.CoroutineScope
		import kotlinx.coroutines.channels.awaitClose
		import kotlinx.coroutines.flow.Flow
		import kotlinx.coroutines.flow.MutableStateFlow
		import kotlinx.coroutines.flow.SharingStarted
		import kotlinx.coroutines.flow.StateFlow
		import kotlinx.coroutines.flow.asFlow
		import kotlinx.coroutines.flow.callbackFlow
		import kotlinx.coroutines.flow.combine
		import kotlinx.coroutines.flow.distinctUntilChanged
		import kotlinx.coroutines.flow.filter
		import kotlinx.coroutines.flow.filterIsInstance
		import kotlinx.coroutines.flow.flatMapLatest
		import kotlinx.coroutines.flow.flowOn
		import kotlinx.coroutines.flow.map
		import kotlinx.coroutines.flow.merge
		import kotlinx.coroutines.flow.onEach
		import kotlinx.coroutines.flow.onStart
		import kotlinx.coroutines.flow.scan
		import kotlinx.coroutines.flow.stateIn

		/** Repository for providing access to display related information and events. */
		interface DisplayRepository : DisplayRepositoryFromLib {
		/** Display change event indicating a change to the given displayId has occurred. */
		val displayChangeEvent: Flow<Int>

		/** Display addition event indicating a new display has been added. */
		val displayAdditionEvent: Flow<Display?>

		/** Display removal event indicating a display has been removed. */
		val displayRemovalEvent: Flow<Int>

		/** A [StateFlow] that maintains a set of display IDs that should have system decorations. */
		val displayIdsWithSystemDecorations: StateFlow<Set<Int>>

		/**
		* Provides the current set of display ids.
		*
		* Note that it is preferred to use this instead of [displays] if only the
		* [Display.getDisplayId] is needed.
		*/
		val displayIds: StateFlow<Set<Int>>

		/**
		* Pending display id that can be enabled/disabled.
		*
		* When `null`, it means there is no pending display waiting to be enabled.
		*/
		val pendingDisplay: Flow<PendingDisplay?>

		/** Whether the default display is currently off. */
		val defaultDisplayOff: Flow<Boolean>

		/**
		* Given a display ID int, return the corresponding Display object, or null if none exist.
		*
		* This method is guaranteed to not result in any binder call.
		*/
		fun getDisplay(displayId: Int): Display? =
		displays.value.firstOrNull { it.displayId == displayId }

		/** Represents a connected display that has not been enabled yet. */
		interface PendingDisplay {
		/** Id of the pending display. */
		val id: Int

		/** Enables the display, making it available to the system. */
		suspend fun enable()

		/**
		* Ignores the pending display. When called, this specific display id doesn't appear as
		* pending anymore until the display is disconnected and reconnected again.
		*/
		suspend fun ignore()

		/** Disables the display, making it unavailable to the system. */
		suspend fun disable()
		}
		}

		@SysUISingleton
		@@ -124,310 +48,11 @@ interface DisplayRepository : DisplayRepositoryFromLib {
		class DisplayRepositoryImpl
		@Inject
		constructor(
		private val displayManager: DisplayManager,
		private val commandQueue: CommandQueue,
		private val windowManager: IWindowManager,
		@Background backgroundHandler: Handler,
		@Background bgApplicationScope: CoroutineScope,
		@Background backgroundCoroutineDispatcher: CoroutineDispatcher,
		) : DisplayRepository {
		private val allDisplayEvents: Flow<DisplayEvent> =
		conflatedCallbackFlow {
		val callback =
		object : DisplayListener {
		override fun onDisplayAdded(displayId: Int) {
		trySend(DisplayEvent.Added(displayId))
		}

		override fun onDisplayRemoved(displayId: Int) {
		trySend(DisplayEvent.Removed(displayId))
		}

		override fun onDisplayChanged(displayId: Int) {
		trySend(DisplayEvent.Changed(displayId))
		}
		}
		displayManager.registerDisplayListener(
		callback,
		backgroundHandler,
		EVENT_TYPE_DISPLAY_ADDED or
		EVENT_TYPE_DISPLAY_CHANGED or
		EVENT_TYPE_DISPLAY_REMOVED,
		)
		awaitClose { displayManager.unregisterDisplayListener(callback) }
		}
		.onStart { emit(DisplayEvent.Changed(Display.DEFAULT_DISPLAY)) }
		.debugLog("allDisplayEvents")
		.flowOn(backgroundCoroutineDispatcher)

		override val displayChangeEvent: Flow<Int> =
		allDisplayEvents.filterIsInstance<DisplayEvent.Changed>().map { event -> event.displayId }

		override val displayRemovalEvent: Flow<Int> =
		allDisplayEvents.filterIsInstance<DisplayEvent.Removed>().map { it.displayId }

		// This is necessary because there might be multiple displays, and we could
		// have missed events for those added before this process or flow started.
		// Note it causes a binder call from the main thread (it's traced).
		private val initialDisplays: Set<Display> =
		traceSection("$TAG#initialDisplays") { displayManager.displays?.toSet() ?: emptySet() }
		private val initialDisplayIds = initialDisplays.map { display -> display.displayId }.toSet()

		/** Propagate to the listeners only enabled displays */
		private val enabledDisplayIds: StateFlow<Set<Int>> =
		allDisplayEvents
		.scan(initial = initialDisplayIds) { previousIds: Set<Int>, event: DisplayEvent ->
		val id = event.displayId
		when (event) {
		is DisplayEvent.Removed -> previousIds - id
		is DisplayEvent.Added,
		is DisplayEvent.Changed -> previousIds + id
		}
		}
		.distinctUntilChanged()
		.debugLog("enabledDisplayIds")
		.stateIn(bgApplicationScope, SharingStarted.WhileSubscribed(), initialDisplayIds)

		private val defaultDisplay by lazy {
		getDisplayFromDisplayManager(Display.DEFAULT_DISPLAY)
		?: error("Unable to get default display.")
		}

		/**
		* Represents displays that went though the [DisplayListener.onDisplayAdded] callback.
		*
		* Those are commonly the ones provided by [DisplayManager.getDisplays] by default.
		*/
		private val enabledDisplays: StateFlow<Set<Display>> =
		enabledDisplayIds
		.mapElementsLazily { displayId -> getDisplayFromDisplayManager(displayId) }
		.onEach {
		if (it.isEmpty()) Log.wtf(TAG, "No enabled displays. This should never happen.")
		}
		.flowOn(backgroundCoroutineDispatcher)
		.debugLog("enabledDisplays")
		.stateIn(
		bgApplicationScope,
		started = SharingStarted.WhileSubscribed(),
		// This triggers a single binder call on the UI thread per process. The
		// alternative would be to use sharedFlows, but they are prohibited due to
		// performance concerns.
		// Ultimately, this is a trade-off between a one-time UI thread binder call and
		// the constant overhead of sharedFlows.
		initialValue = initialDisplays,
		)

		/**
		* Represents displays that went though the [DisplayListener.onDisplayAdded] callback.
		*
		* Those are commonly the ones provided by [DisplayManager.getDisplays] by default.
		*/
		override val displays: StateFlow<Set<Display>> = enabledDisplays

		override val displayIds: StateFlow<Set<Int>> = enabledDisplayIds

		/**
		* Implementation that maps from [displays], instead of [allDisplayEvents] for 2 reasons:
		* 1. Guarantee that it emits __after__ [displays] emitted. This way it is guaranteed that
		* calling [getDisplay] for the newly added display will be non-null.
		* 2. Reuse the existing instance of [Display] without a new call to [DisplayManager].
		*/
		override val displayAdditionEvent: Flow<Display?> =
		displays
		.pairwiseBy { previousDisplays, currentDisplays -> currentDisplays - previousDisplays }
		.flatMapLatest { it.asFlow() }

		val _ignoredDisplayIds = MutableStateFlow<Set<Int>>(emptySet())
		private val ignoredDisplayIds: Flow<Set<Int>> = _ignoredDisplayIds.debugLog("ignoredDisplayIds")

		private fun getInitialConnectedDisplays(): Set<Int> =
		traceSection("$TAG#getInitialConnectedDisplays") {
		displayManager
		.getDisplays(DISPLAY_CATEGORY_ALL_INCLUDING_DISABLED)
		.map { it.displayId }
		.toSet()
		.also {
		if (DEBUG) {
		Log.d(TAG, "getInitialConnectedDisplays: $it")
		}
		}
		}

		/* keeps connected displays until they are disconnected. */
		private val connectedDisplayIds: StateFlow<Set<Int>> =
		conflatedCallbackFlow {
		val connectedIds = getInitialConnectedDisplays().toMutableSet()
		val callback =
		object : DisplayConnectionListener {
		override fun onDisplayConnected(id: Int) {
		if (DEBUG) {
		Log.d(TAG, "display with id=$id connected.")
		}
		connectedIds += id
		_ignoredDisplayIds.value -= id
		trySend(connectedIds.toSet())
		}

		override fun onDisplayDisconnected(id: Int) {
		connectedIds -= id
		if (DEBUG) {
		Log.d(TAG, "display with id=$id disconnected.")
		}
		_ignoredDisplayIds.value -= id
		trySend(connectedIds.toSet())
		}
		}
		trySend(connectedIds.toSet())
		displayManager.registerDisplayListener(
		callback,
		backgroundHandler,
		/* eventFlags */ 0,
		DisplayManager.PRIVATE_EVENT_TYPE_DISPLAY_CONNECTION_CHANGED,
		)
		awaitClose { displayManager.unregisterDisplayListener(callback) }
		}
		.distinctUntilChanged()
		.debugLog("connectedDisplayIds")
		.stateIn(
		bgApplicationScope,
		started = SharingStarted.WhileSubscribed(),
		// The initial value is set to empty, but connected displays are gathered as soon as
		// the flow starts being collected. This is to ensure the call to get displays (an
		// IPC) happens in the background instead of when this object
		// is instantiated.
		initialValue = emptySet(),
		)

		private val connectedExternalDisplayIds: Flow<Set<Int>> =
		connectedDisplayIds
		.map { connectedDisplayIds ->
		traceSection("$TAG#filteringExternalDisplays") {
		connectedDisplayIds
		.filter { id -> getDisplayType(id) == Display.TYPE_EXTERNAL }
		.toSet()
		}
		}
		.flowOn(backgroundCoroutineDispatcher)
		.debugLog("connectedExternalDisplayIds")

		private fun getDisplayType(displayId: Int): Int? =
		traceSection("$TAG#getDisplayType") { displayManager.getDisplay(displayId)?.type }

		private fun getDisplayFromDisplayManager(displayId: Int): Display? =
		traceSection("$TAG#getDisplay") { displayManager.getDisplay(displayId) }

		/**
		* Pending displays are the ones connected, but not enabled and not ignored.
		*
		* A connected display is ignored after the user makes the decision to use it or not. For now,
		* the initial decision from the user is final and not reversible.
		*/
		private val pendingDisplayIds: Flow<Set<Int>> =
		combine(enabledDisplayIds, connectedExternalDisplayIds, ignoredDisplayIds) {
		enabledDisplaysIds,
		connectedExternalDisplayIds,
		ignoredDisplayIds ->
		if (DEBUG) {
		Log.d(
		TAG,
		"combining enabled=$enabledDisplaysIds, " +
		"connectedExternalDisplayIds=$connectedExternalDisplayIds, " +
		"ignored=$ignoredDisplayIds",
		)
		}
		connectedExternalDisplayIds - enabledDisplaysIds - ignoredDisplayIds
		}
		.debugLog("allPendingDisplayIds")

		/** Which display id should be enabled among the pending ones. */
		private val pendingDisplayId: Flow<Int?> =
		pendingDisplayIds.map { it.maxOrNull() }.distinctUntilChanged().debugLog("pendingDisplayId")

		override val pendingDisplay: Flow<DisplayRepository.PendingDisplay?> =
		pendingDisplayId
		.map { displayId ->
		val id = displayId ?: return@map null
		object : DisplayRepository.PendingDisplay {
		override val id = id

		override suspend fun enable() {
		traceSection("DisplayRepository#enable($id)") {
		if (DEBUG) {
		Log.d(TAG, "Enabling display with id=$id")
		}
		displayManager.enableConnectedDisplay(id)
		}
		// After the display has been enabled, it is automatically ignored.
		ignore()
		}

		override suspend fun ignore() {
		traceSection("DisplayRepository#ignore($id)") {
		_ignoredDisplayIds.value += id
		}
		}

		override suspend fun disable() {
		ignore()
		traceSection("DisplayRepository#disable($id)") {
		if (DEBUG) {
		Log.d(TAG, "Disabling display with id=$id")
		}
		displayManager.disableConnectedDisplay(id)
		}
		}
		}
		}
		.debugLog("pendingDisplay")

		override val defaultDisplayOff: Flow<Boolean> =
		displayChangeEvent
		.filter { it == Display.DEFAULT_DISPLAY }
		.map { defaultDisplay.state == Display.STATE_OFF }
		.distinctUntilChanged()

		private fun <T> Flow<T>.debugLog(flowName: String): Flow<T> {
		return if (DEBUG) {
		traceEach(flowName, logcat = true, traceEmissionCount = true)
		} else {
		this
		}
		}

		/**
		* Maps a set of T to a set of V, minimizing the number of `createValue` calls taking into
		* account the diff between each root flow emission.
		*
		* This is needed to minimize the number of [getDisplayFromDisplayManager] in this class. Note
		* that if the [createValue] returns a null element, it will not be added in the output set.
		*/
		private fun <T, V> Flow<Set<T>>.mapElementsLazily(createValue: (T) -> V?): Flow<Set<V>> {
		data class State<T, V>(
		val previousSet: Set<T>,
		// Caches T values from the previousSet that were already converted to V
		val valueMap: Map<T, V>,
		val resultSet: Set<V>,
		)

		val emptyInitialState = State(emptySet<T>(), emptyMap(), emptySet<V>())
		return this.scan(emptyInitialState) { state, currentSet ->
		if (currentSet == state.previousSet) {
		state
		} else {
		val removed = state.previousSet - currentSet
		val added = currentSet - state.previousSet
		val newMap = state.valueMap.toMutableMap()

		added.forEach { key -> createValue(key)?.let { newMap[key] = it } }
		removed.forEach { key -> newMap.remove(key) }

		val resultSet = newMap.values.toSet()
		State(currentSet, newMap, resultSet)
		}
		}
		.filter { it != emptyInitialState }
		.map { it.resultSet }
		}
		private val displayRepositoryFromLib: com.android.app.displaylib.DisplayRepository,
		) : DisplayRepositoryFromLib by displayRepositoryFromLib, DisplayRepository {

		private val decorationEvents: Flow<Event> = callbackFlow {
		val callback =
		@@ -481,20 +106,5 @@ constructor(

		private companion object {
		const val TAG = "DisplayRepository"
		val DEBUG = Log.isLoggable(TAG, Log.DEBUG) \|\| Compile.IS_DEBUG
		}
		}

		/** Used to provide default implementations for all methods. */
		private interface DisplayConnectionListener : DisplayListener {

		override fun onDisplayConnected(id: Int) {}

		override fun onDisplayDisconnected(id: Int) {}

		override fun onDisplayAdded(id: Int) {}

		override fun onDisplayRemoved(id: Int) {}

		override fun onDisplayChanged(id: Int) {}
		}

packages/SystemUI/src/com/android/systemui/display/domain/interactor/ConnectedDisplayInteractor.kt

+3 −1

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ package com.android.systemui.display.domain.interactor

		import android.companion.virtual.VirtualDeviceManager
		import android.view.Display
		import com.android.app.displaylib.DisplayRepository as DisplayRepositoryFromLib
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.dagger.qualifiers.Background
		import com.android.systemui.display.data.repository.DeviceStateRepository
		@@ -138,7 +139,8 @@ constructor(
		.distinctUntilChanged()
		.flowOn(backgroundCoroutineDispatcher)

		private fun DisplayRepository.PendingDisplay.toInteractorPendingDisplay(): PendingDisplay =
		private fun DisplayRepositoryFromLib.PendingDisplay.toInteractorPendingDisplay():
		PendingDisplay =
		object : PendingDisplay {
		override suspend fun enable() = this@toInteractorPendingDisplay.enable()