Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 75e2eb72 authored by Nicolò Mazzucato's avatar Nicolò Mazzucato Committed by Android (Google) Code Review
Browse files

Merge "Minor improvements to DisplayRepository logs" into main

parents 50686c5b 0535a78f
Loading
Loading
Loading
Loading
+8 −2
Original line number Original line Diff line number Diff line
@@ -143,7 +143,7 @@ constructor(
                        private val connectedIds = mutableSetOf<Int>()
                        private val connectedIds = mutableSetOf<Int>()
                        override fun onDisplayConnected(id: Int) {
                        override fun onDisplayConnected(id: Int) {
                            if (DEBUG) {
                            if (DEBUG) {
                                Log.d(TAG, "$id connected")
                                Log.d(TAG, "display with id=$id connected.")
                            }
                            }
                            connectedIds += id
                            connectedIds += id
                            ignoredDisplayIds.value -= id
                            ignoredDisplayIds.value -= id
@@ -153,7 +153,7 @@ constructor(
                        override fun onDisplayDisconnected(id: Int) {
                        override fun onDisplayDisconnected(id: Int) {
                            connectedIds -= id
                            connectedIds -= id
                            if (DEBUG) {
                            if (DEBUG) {
                                Log.d(TAG, "$id disconnected. Connected ids: $connectedIds")
                                Log.d(TAG, "display with id=$id disconnected.")
                            }
                            }
                            ignoredDisplayIds.value -= id
                            ignoredDisplayIds.value -= id
                            trySend(connectedIds.toSet())
                            trySend(connectedIds.toSet())
@@ -215,6 +215,9 @@ constructor(
                    override val id = id
                    override val id = id
                    override suspend fun enable() {
                    override suspend fun enable() {
                        traceSection("DisplayRepository#enable($id)") {
                        traceSection("DisplayRepository#enable($id)") {
                            if (DEBUG) {
                                Log.d(TAG, "Enabling display with id=$id")
                            }
                            displayManager.enableConnectedDisplay(id)
                            displayManager.enableConnectedDisplay(id)
                        }
                        }
                        // After the display has been enabled, it is automatically ignored.
                        // After the display has been enabled, it is automatically ignored.
@@ -230,6 +233,9 @@ constructor(
                    override suspend fun disable() {
                    override suspend fun disable() {
                        ignore()
                        ignore()
                        traceSection("DisplayRepository#disable($id)") {
                        traceSection("DisplayRepository#disable($id)") {
                            if (DEBUG) {
                                Log.d(TAG, "Disabling display with id=$id")
                            }
                            displayManager.disableConnectedDisplay(id)
                            displayManager.disableConnectedDisplay(id)
                        }
                        }
                    }
                    }