From bcd351613212ce53f192a3a75470dbfc6022a534 Mon Sep 17 00:00:00 2001
From: Bruno Martins <bgcngm@gmail.com>
Date: Tue, 8 Dec 2020 22:03:48 +0000
Subject: msm8996-common: Migrate to Health 2.1 HAL

Change-Id: Ic6302844ac58c16713b43b6871a705b9b4749a96
---
 manifest.xml | 9 ---------
 msm8996.mk   | 7 ++++---
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/manifest.xml b/manifest.xml
index 788b17b..50fdbf4 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -144,15 +144,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.health</name>
-        <transport>hwbinder</transport>
-        <version>2.0</version>
-        <interface>
-            <name>IHealth</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.keymaster</name>
         <transport>hwbinder</transport>
diff --git a/msm8996.mk b/msm8996.mk
index 57cbbe2..f1c7b55 100755
--- a/msm8996.mk
+++ b/msm8996.mk
@@ -1,6 +1,6 @@
 #
 # Copyright (C) 2016 The CyanogenMod Project
-# Copyright (C) 2017-2019 The LineageOS Project
+# Copyright (C) 2017-2020 The LineageOS Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -241,8 +241,9 @@ PRODUCT_COPY_FILES += \
 
 # Healthd
 PRODUCT_PACKAGES += \
-    android.hardware.health@2.0-impl:64 \
-    android.hardware.health@2.0-service
+    android.hardware.health@2.1-impl:64 \
+    android.hardware.health@2.1-impl.recovery \
+    android.hardware.health@2.1-service
 
 # HW crypto
 PRODUCT_PACKAGES += \
-- 
cgit v1.2.3