From 5cc9ac99e8b9d9bb7b995eb6acbe10a98dccc6ce Mon Sep 17 00:00:00 2001 From: "daren.liao" Date: Thu, 19 Dec 2019 22:35:02 +0800 Subject: [PATCH] Change checking rule in startArcAction(false) for HDMI CTS [Description] For HDMI CTS Certification: HEACT 5-15: IEC 60958-1 Stream Verification Before sending or CEC frameworks checks whether the port connected AVR is valid - if it's connected to ARC port - if it's adjacent to TV If AVR changes its PA from valid to non-adjacent (E.g. ARC port : 1.0.0.0 is valid, it changes to 1.1.0.0) With the current framework design, won't be sent. However, should still be sent to pass this test item. We should not consider whether the port is direct connected or not when startArcAction(false) We should always send for this case. Test: Pass HEACT 5-15: IEC 60958-1 Stream Verification Change-Id: I94f4be9fbffbf3e81c35ef81b36a81de3265dd66 --- .../java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java index 9a85f952446bf..a1226115b6e41 100644 --- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java +++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java @@ -1092,10 +1092,11 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice { HdmiDeviceInfo avr = getAvrDeviceInfo(); if (avr != null && (avrAddress == avr.getLogicalAddress()) - && isConnectedToArcPort(avr.getPhysicalAddress()) - && isDirectConnectAddress(avr.getPhysicalAddress())) { + && isConnectedToArcPort(avr.getPhysicalAddress())) { if (enabled) { - return isConnected(avr.getPortId()) && isArcFeatureEnabled(avr.getPortId()); + return isConnected(avr.getPortId()) + && isArcFeatureEnabled(avr.getPortId()) + && isDirectConnectAddress(avr.getPhysicalAddress()); } else { return true; }