From b69b94ab3083c931b95a19485f4b558d1bc43cc6 Mon Sep 17 00:00:00 2001
From: Jack Wu <wjack@google.com>
Date: Thu, 5 Mar 2020 14:23:34 +0800
Subject: [PATCH] davinci: Uprev health HAL to v2.1

Bug: 145943771
Test: lshal debug android.hardware.health@2.1::IHealth/default
Change-Id: I84f20459f5579e318d8e9f5f9ce68a733df27c53
Signed-off-by: Jack Wu <wjack@google.com>
Signed-off-by: Adithya R <gh0strider.2k18.reborn@gmail.com>
---
 configs/hidl/manifest.xml | 10 ----------
 device.mk                 |  3 ++-
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/configs/hidl/manifest.xml b/configs/hidl/manifest.xml
index d48502f..9e034c5 100644
--- a/configs/hidl/manifest.xml
+++ b/configs/hidl/manifest.xml
@@ -79,16 +79,6 @@
         </interface>
         <fqname>@1.0::IGatekeeper/default</fqname>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.health</name>
-        <transport>hwbinder</transport>
-        <version>2.0</version>
-        <interface>
-            <name>IHealth</name>
-            <instance>default</instance>
-        </interface>
-        <fqname>@2.0::IHealth/default</fqname>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.keymaster</name>
         <transport>hwbinder</transport>
diff --git a/device.mk b/device.mk
index 2291cc0..9ca15ba 100644
--- a/device.mk
+++ b/device.mk
@@ -198,7 +198,8 @@ PRODUCT_COPY_FILES += \
 
 # Health
 PRODUCT_PACKAGES += \
-    android.hardware.health@2.0-service
+    android.hardware.health@2.1-impl \
+    android.hardware.health@2.1-service
 
 # HIDL
 PRODUCT_PACKAGES += \