summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Hongguang Chen <hgchen@google.com> 2023-11-16 19:36:07 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-11-16 19:36:07 +0000
commitc94e158e21e65ff31ae29a10bc5e24ec73d528c8 (patch)
tree039839b68cda1b95c2c2fa6af59324dc62bfd77e
parent98d859c37b95628c8e2a2aa7cd779c2fefb6ff21 (diff)
parent6a918d0f87f88398fbc51e032723a322e7f2fa23 (diff)
Merge "Correct portIdToPath for TV" into main am: 75a671c7fc am: 6a918d0f87
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2822332 Change-Id: I58c833c2d80f7694ba14a7e767c7af7129d780d3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--services/core/java/com/android/server/hdmi/HdmiCecNetwork.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/hdmi/HdmiCecNetwork.java b/services/core/java/com/android/server/hdmi/HdmiCecNetwork.java
index 7045e65a8936..d994849611f8 100644
--- a/services/core/java/com/android/server/hdmi/HdmiCecNetwork.java
+++ b/services/core/java/com/android/server/hdmi/HdmiCecNetwork.java
@@ -899,6 +899,9 @@ public class HdmiCecNetwork {
* port id.
*/
int portIdToPath(int portId) {
+ if (portId == Constants.CEC_SWITCH_HOME) {
+ return getPhysicalAddress();
+ }
HdmiPortInfo portInfo = getPortInfo(portId);
if (portInfo == null) {
Slog.e(TAG, "Cannot find the port info: " + portId);