commit 67555a295f904ba8fafd848c966a4efc39e4ca6a
author Treehugger Robot <treehugger-gerrit@google.com> Wed Feb 03 14:39:09 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Feb 03 14:39:09 2021 +0000
tree ac3a8d453a32ad2324c6ac7749a22b1aade8ce1b
parent 356c8371caf16fdaf895c0845fb6cc6d154fd2a4
parent 1e6de22b7961e71972e2dc3ba3a90684b09a411a

Merge "Remove TV CEC HAL v2.0 from compatibility matrices"

compatibility_matrices/compatibility_matrix.4.xml

diff --git a/compatibility_matrices/compatibility_matrix.4.xml b/compatibility_matrices/compatibility_matrix.4.xml
index 5e1266e..e5e012c 100644
--- a/compatibility_matrices/compatibility_matrix.4.xml
+++ b/compatibility_matrices/compatibility_matrix.4.xml
@@ -432,7 +432,6 @@
     <hal format="hidl" optional="true">
         <name>android.hardware.tv.cec</name>
         <version>1.0</version>
-        <version>2.0</version>
         <interface>
             <name>IHdmiCec</name>
             <instance>default</instance>

compatibility_matrices/compatibility_matrix.5.xml

diff --git a/compatibility_matrices/compatibility_matrix.5.xml b/compatibility_matrices/compatibility_matrix.5.xml
index 8bc663d..e772b6f 100644
--- a/compatibility_matrices/compatibility_matrix.5.xml
+++ b/compatibility_matrices/compatibility_matrix.5.xml
@@ -467,7 +467,6 @@
     <hal format="hidl" optional="true">
         <name>android.hardware.tv.cec</name>
         <version>1.0</version>
-        <version>2.0</version>
         <interface>
             <name>IHdmiCec</name>
             <instance>default</instance>

compatibility_matrices/compatibility_matrix.current.xml

diff --git a/compatibility_matrices/compatibility_matrix.current.xml b/compatibility_matrices/compatibility_matrix.current.xml
index a328f4f..5e7e4c7 100644
--- a/compatibility_matrices/compatibility_matrix.current.xml
+++ b/compatibility_matrices/compatibility_matrix.current.xml
@@ -532,7 +532,6 @@
     <hal format="hidl" optional="true">
         <name>android.hardware.tv.cec</name>
         <version>1.0</version>
-        <version>2.0</version>
         <interface>
             <name>IHdmiCec</name>
             <instance>default</instance>

compatibility_matrices/exclude/fcm_exclude.cpp

diff --git a/compatibility_matrices/exclude/fcm_exclude.cpp b/compatibility_matrices/exclude/fcm_exclude.cpp
index 849df94..d00022f 100644
--- a/compatibility_matrices/exclude/fcm_exclude.cpp
+++ b/compatibility_matrices/exclude/fcm_exclude.cpp
@@ -72,6 +72,8 @@
             "android.hardware.nfc@1.0",
             // TODO(b/171260715) Remove when HAL definition is removed
             "android.hardware.radio.deprecated@1.0",
+            // TODO(b/178772241) Remove when HAL definition is removed
+            "android.hardware.tv.cec@2.0",
     };
 
     auto package_has_prefix = [&](const std::string& prefix) {