From cf80a53f09655a7e04f0efb8feedf2df59d79a44 Mon Sep 17 00:00:00 2001
From: Nathalie Le Clair <lcnathalie@google.com>
Date: Fri, 10 Feb 2023 15:50:41 +0100
Subject: [PATCH] Update HAL API names

Bug: 268601655
Test: make
Change-Id: I9b61d45655822cbb441ff2b51aa69b20edfbc8d9
---
 services/core/java/com/android/server/hdmi/Constants.java | 8 ++++----
 .../com/android/server/hdmi/FakeEArcNativeWrapper.java    | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/services/core/java/com/android/server/hdmi/Constants.java b/services/core/java/com/android/server/hdmi/Constants.java
index e21ec72439587..c235299e3a65c 100644
--- a/services/core/java/com/android/server/hdmi/Constants.java
+++ b/services/core/java/com/android/server/hdmi/Constants.java
@@ -601,12 +601,12 @@ final class Constants {
     })
     @interface RcProfileSource {}
 
-    static final int HDMI_EARC_STATUS_IDLE = IEArcStatus.STATUS_IDLE; // IDLE1
+    static final int HDMI_EARC_STATUS_IDLE = IEArcStatus.IDLE; // IDLE1
     static final int HDMI_EARC_STATUS_EARC_PENDING =
-            IEArcStatus.STATUS_EARC_PENDING; // DISC1 and DISC2
-    static final int HDMI_EARC_STATUS_ARC_PENDING = IEArcStatus.STATUS_ARC_PENDING; // IDLE2 for ARC
+            IEArcStatus.EARC_PENDING; // DISC1 and DISC2
+    static final int HDMI_EARC_STATUS_ARC_PENDING = IEArcStatus.ARC_PENDING; // IDLE2 for ARC
     static final int HDMI_EARC_STATUS_EARC_CONNECTED =
-            IEArcStatus.STATUS_EARC_CONNECTED; // eARC connected
+            IEArcStatus.EARC_CONNECTED; // eARC connected
 
     @IntDef({
             HDMI_EARC_STATUS_IDLE,
diff --git a/services/tests/servicestests/src/com/android/server/hdmi/FakeEArcNativeWrapper.java b/services/tests/servicestests/src/com/android/server/hdmi/FakeEArcNativeWrapper.java
index 6f6cf8e3ad924..ac491f44bbbf2 100644
--- a/services/tests/servicestests/src/com/android/server/hdmi/FakeEArcNativeWrapper.java
+++ b/services/tests/servicestests/src/com/android/server/hdmi/FakeEArcNativeWrapper.java
@@ -44,7 +44,7 @@ final class FakeEArcNativeWrapper implements HdmiEarcController.EArcNativeWrappe
 
     @Override
     public byte nativeGetState(int portId) {
-        return IEArcStatus.STATUS_IDLE;
+        return IEArcStatus.IDLE;
     }
 
     @Override