From da86cdbf035e8c4acd178db25af9d394cd343da8 Mon Sep 17 00:00:00 2001
From: Yifan Hong <elsk@google.com>
Date: Wed, 20 Jan 2021 20:21:49 -0800
Subject: [PATCH] Deprecate HIDL health storage HAL.

If a device launching with S VINTF uses health storage HAL,
it must use AIDL. If HIDL health storage HAL is used,
a build error will occur to complain about deprecated HALs.

Test: manual test that if the HIDL HAL is served on cuttlefish, then
      `m check-vintf-all` shows the following error:

android.hardware.health.storage@1.0::IStorage/default is deprecated
in compatibility matrix at FCM Version 6; it should not be served.

Bug: 177470478
Change-Id: I3c28352f5f8d491ed0e1f9292b80d2083699f829
---
 compatibility_matrices/compatibility_matrix.current.xml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/compatibility_matrices/compatibility_matrix.current.xml b/compatibility_matrices/compatibility_matrix.current.xml
index 5a5c5a6f1f..d371f7c982 100644
--- a/compatibility_matrices/compatibility_matrix.current.xml
+++ b/compatibility_matrices/compatibility_matrix.current.xml
@@ -258,14 +258,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl" optional="true">
-        <name>android.hardware.health.storage</name>
-        <version>1.0</version>
-        <interface>
-            <name>IStorage</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="aidl" optional="true">
         <name>android.hardware.health.storage</name>
         <version>1</version>