From c223843fa7b6431d99eed58b0d8edefe4e0213eb Mon Sep 17 00:00:00 2001
From: Yifan Hong <elsk@google.com>
Date: Fri, 10 Dec 2021 20:52:59 +0000
Subject: [PATCH] Revert "health: require AIDL HAL and deprecate HIDL HAL."

Revert "Implement health AIDL HAL on cuttlefish."

Revert submission 1891478-health-aidl-cuttlefish

Reason for revert: break db845c build
Reverted Changes:
Ibd4dec0a2:health: require AIDL HAL and deprecate HIDL HAL.
Ic1c753b40:Implement health AIDL HAL on cuttlefish.

Fixes: 210084272

Change-Id: I5ad1bcb788598eb93053c85e5d56f49643ba9037
---
 .../compatibility_matrix.current.xml                  | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/compatibility_matrices/compatibility_matrix.current.xml b/compatibility_matrices/compatibility_matrix.current.xml
index 6c8ff37804..ece4de73cc 100644
--- a/compatibility_matrices/compatibility_matrix.current.xml
+++ b/compatibility_matrices/compatibility_matrix.current.xml
@@ -268,7 +268,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>