commit 5ad3bb1f87520b0ad1d592fb2f071793da5d92d5
author Yifan Hong <elsk@google.com> Fri Dec 10 21:11:24 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Dec 10 21:11:24 2021 +0000
tree 83baa67c5e0e7e9a3928afff527d35407bb6b95b
parent 297d2f1c44ebe4779c20783c331ee8f4d45edf44
parent c223843fa7b6431d99eed58b0d8edefe4e0213eb

Merge "Revert "health: require AIDL HAL and deprecate HIDL HAL.""

compatibility_matrices/compatibility_matrix.current.xml

diff --git a/compatibility_matrices/compatibility_matrix.current.xml b/compatibility_matrices/compatibility_matrix.current.xml
index f0311c7..c39db36 100644
--- a/compatibility_matrices/compatibility_matrix.current.xml
+++ b/compatibility_matrices/compatibility_matrix.current.xml
@@ -267,7 +267,16 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="aidl" optional="false">
+    <hal format="hidl" optional="false">
+        <name>android.hardware.health</name>
+        <version>2.1</version>
+        <interface>
+            <name>IHealth</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <!-- TODO(b/177269435): require health AIDL HAL and deprecate HIDL HAL -->
+    <hal format="aidl" optional="true">
         <name>android.hardware.health</name>
         <version>1</version>
         <interface>