From 3433911ef36b4be187ccaeba3164a11f639ab7bd Mon Sep 17 00:00:00 2001 From: "Hannah.Hsu" Date: Thu, 9 Nov 2023 14:23:49 +0800 Subject: Correct portIdToPath for TV There is no portInfo for TV itself (Physical address 0.0.0.0 with port 0) and would cause system get invalid path for command . Bug: b/309904148 Change-Id: Icd7099e8afbc588eee8e7b27fb6fcfb914d7d032 --- services/core/java/com/android/server/hdmi/HdmiCecNetwork.java | 3 +++ 1 file changed, 3 insertions(+) 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); -- cgit v1.2.3-59-g8ed1b