From a7a64fde708df1c4f428f64ba6daeb492f26a2be Mon Sep 17 00:00:00 2001
From: Nathalie Le Clair <lcnathalie@google.com>
Date: Tue, 24 Jan 2023 18:06:53 +0100
Subject: [PATCH] Add portId to HPD-related methods

Test: lunch cf_x86_tv-userdebug; make;
atest VtsHalTvHdmiConnectionAidlTargetTest;
Bug: 266178786

Change-Id: Ibacef0417d3b4e95ac3aca21724828a09e4e8d38
---
 .../java/com/android/server/hdmi/HdmiCecController.java     | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/services/core/java/com/android/server/hdmi/HdmiCecController.java b/services/core/java/com/android/server/hdmi/HdmiCecController.java
index 376e6f83258fa..5cdb377c40fa0 100644
--- a/services/core/java/com/android/server/hdmi/HdmiCecController.java
+++ b/services/core/java/com/android/server/hdmi/HdmiCecController.java
@@ -1128,8 +1128,7 @@ final class HdmiCecController {
         @Override
         public void nativeSetHpdSignalType(int signal, int portId) {
             try {
-                // TODO(b/266178786) add portId to the HAL method
-                mHdmiConnection.setHpdSignal((byte) signal);
+                mHdmiConnection.setHpdSignal((byte) signal, portId);
             } catch (ServiceSpecificException sse) {
                 HdmiLogger.error(
                         "Could not set HPD signal type for portId " + portId + " to " + signal
@@ -1144,8 +1143,7 @@ final class HdmiCecController {
         @Override
         public int nativeGetHpdSignalType(int portId) {
             try {
-                // TODO(b/266178786) add portId to the HAL method
-                return mHdmiConnection.getHpdSignal();
+                return mHdmiConnection.getHpdSignal(portId);
             } catch (RemoteException e) {
                 HdmiLogger.error(
                         "Could not get HPD signal type for portId " + portId + ". Exception: ", e);