From fcfdd08bdcb9ff6af58452ac6f36356b59da6c80 Mon Sep 17 00:00:00 2001
From: Michal Olech <molech@google.com>
Date: Fri, 6 Nov 2020 14:49:48 +0100
Subject: [PATCH] [CEC Configuration] Use 'int-value' field instead of
 'hex-value'

Bug: 166426337
Test: atest HdmiCecConfigTest
Change-Id: Ibb9f1aa87c7af505d1802057266a4c558f6e82af
---
 .../android/server/hdmi/HdmiCecConfig.java    |  4 +---
 services/core/xsd/cec-config/cec-config.xsd   |  3 +--
 .../core/xsd/cec-config/schema/current.txt    |  6 ++---
 .../server/hdmi/HdmiCecConfigTest.java        | 24 +++++++++----------
 4 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/services/core/java/com/android/server/hdmi/HdmiCecConfig.java b/services/core/java/com/android/server/hdmi/HdmiCecConfig.java
index a4564a9e0bbee..ca78f35b9f1f4 100644
--- a/services/core/java/com/android/server/hdmi/HdmiCecConfig.java
+++ b/services/core/java/com/android/server/hdmi/HdmiCecConfig.java
@@ -283,9 +283,7 @@ public class HdmiCecConfig {
     }
 
     private int getIntValue(@NonNull Value value) {
-        return value.getHexValue() != null
-               ? Integer.decode(value.getHexValue())
-               : value.getIntValue();
+        return Integer.decode(value.getIntValue());
     }
 
     /**
diff --git a/services/core/xsd/cec-config/cec-config.xsd b/services/core/xsd/cec-config/cec-config.xsd
index 2129044bebcb9..b59c93cce332f 100644
--- a/services/core/xsd/cec-config/cec-config.xsd
+++ b/services/core/xsd/cec-config/cec-config.xsd
@@ -24,7 +24,6 @@
   </xs:complexType>
   <xs:complexType name="value">
     <xs:attribute name="string-value" type="xs:string"/>
-    <xs:attribute name="int-value" type="xs:int"/>
-    <xs:attribute name="hex-value" type="xs:string"/>
+    <xs:attribute name="int-value" type="xs:string"/>
   </xs:complexType>
 </xs:schema>
diff --git a/services/core/xsd/cec-config/schema/current.txt b/services/core/xsd/cec-config/schema/current.txt
index 896ddfcdb40de..75872d4fb8a7e 100644
--- a/services/core/xsd/cec-config/schema/current.txt
+++ b/services/core/xsd/cec-config/schema/current.txt
@@ -22,11 +22,9 @@ package com.android.server.hdmi.cec.config {
 
   public class Value {
     ctor public Value();
-    method public String getHexValue();
-    method public int getIntValue();
+    method public String getIntValue();
     method public String getStringValue();
-    method public void setHexValue(String);
-    method public void setIntValue(int);
+    method public void setIntValue(String);
     method public void setStringValue(String);
   }
 
diff --git a/services/tests/servicestests/src/com/android/server/hdmi/HdmiCecConfigTest.java b/services/tests/servicestests/src/com/android/server/hdmi/HdmiCecConfigTest.java
index 046bba3e0fc5b..a27f7331e4073 100644
--- a/services/tests/servicestests/src/com/android/server/hdmi/HdmiCecConfigTest.java
+++ b/services/tests/servicestests/src/com/android/server/hdmi/HdmiCecConfigTest.java
@@ -410,10 +410,10 @@ public final class HdmiCecConfigTest {
                 + "           value-type=\"int\""
                 + "           user-configurable=\"true\">"
                 + "    <allowed-values>"
-                + "      <value hex-value=\"0x00\" />"
-                + "      <value hex-value=\"0x01\" />"
+                + "      <value int-value=\"0x00\" />"
+                + "      <value int-value=\"0x01\" />"
                 + "    </allowed-values>"
-                + "    <default-value hex-value=\"0x01\" />"
+                + "    <default-value int-value=\"0x01\" />"
                 + "  </setting>"
                 + "</cec-settings>", null);
         assertThat(hdmiCecConfig.getAllowedIntValues(
@@ -556,10 +556,10 @@ public final class HdmiCecConfigTest {
                 + "           value-type=\"int\""
                 + "           user-configurable=\"true\">"
                 + "    <allowed-values>"
-                + "      <value hex-value=\"0x00\" />"
-                + "      <value hex-value=\"0x01\" />"
+                + "      <value int-value=\"0x00\" />"
+                + "      <value int-value=\"0x01\" />"
                 + "    </allowed-values>"
-                + "    <default-value hex-value=\"0x01\" />"
+                + "    <default-value int-value=\"0x01\" />"
                 + "  </setting>"
                 + "</cec-settings>", null);
         assertThat(hdmiCecConfig.getDefaultIntValue(
@@ -741,10 +741,10 @@ public final class HdmiCecConfigTest {
                 + "           value-type=\"int\""
                 + "           user-configurable=\"true\">"
                 + "    <allowed-values>"
-                + "      <value hex-value=\"0x0\" />"
-                + "      <value hex-value=\"0x1\" />"
+                + "      <value int-value=\"0x0\" />"
+                + "      <value int-value=\"0x1\" />"
                 + "    </allowed-values>"
-                + "    <default-value hex-value=\"0x1\" />"
+                + "    <default-value int-value=\"0x1\" />"
                 + "  </setting>"
                 + "</cec-settings>", null);
         assertThat(hdmiCecConfig.getIntValue(
@@ -988,10 +988,10 @@ public final class HdmiCecConfigTest {
                 + "           value-type=\"int\""
                 + "           user-configurable=\"true\">"
                 + "    <allowed-values>"
-                + "      <value hex-value=\"0x0\" />"
-                + "      <value hex-value=\"0x1\" />"
+                + "      <value int-value=\"0x0\" />"
+                + "      <value int-value=\"0x1\" />"
                 + "    </allowed-values>"
-                + "    <default-value hex-value=\"0x1\" />"
+                + "    <default-value int-value=\"0x1\" />"
                 + "  </setting>"
                 + "</cec-settings>", null);
         hdmiCecConfig.setIntValue(HdmiControlManager.CEC_SETTING_NAME_HDMI_CEC_ENABLED,