universal7904: Switch to health AIDL HAL

Change-Id: Icbb7194943388679abd25b2dbd105424c34496a1
diff --git a/rootdir/etc/init.exynos7904.rc b/rootdir/etc/init.exynos7904.rc
index a869e0a..223a6ec 100644
--- a/rootdir/etc/init.exynos7904.rc
+++ b/rootdir/etc/init.exynos7904.rc
@@ -615,13 +615,6 @@
     group system
     disabled
 
-service charger /system/bin/charger
-    class charger
-    user system
-    group system graphics input
-    capabilities SYS_BOOT
-    seclabel u:r:charger:s0
-
 on property:ro.boot.product.model=SM-M205FN
     setprop ro.boot.product.hardware.sku NFC
 
diff --git a/sepolicy/vendor/charger_vendor.te b/sepolicy/vendor/charger_vendor.te
new file mode 100644
index 0000000..e8bae85
--- /dev/null
+++ b/sepolicy/vendor/charger_vendor.te
@@ -0,0 +1,3 @@
+allow charger_vendor device:dir r_file_perms;
+allow charger_vendor sysfs_battery:file r_file_perms;
+allow charger_vendor sysfs_battery_writable:file r_file_perms;
diff --git a/universal7904-common.mk b/universal7904-common.mk
index 7e214c1..7fd68f7 100644
--- a/universal7904-common.mk
+++ b/universal7904-common.mk
@@ -45,6 +45,10 @@
     android.hardware.camera.provider@2.5-service.universal7904 \
     camera.exynos7904
 
+# Charger
+PRODUCT_PACKAGES += \
+    charger_res_images_vendor
+
 # ConfigStore
 PRODUCT_PACKAGES += \
     disable_configstore
@@ -83,9 +87,8 @@
 
 # Health
 PRODUCT_PACKAGES += \
-    android.hardware.health@2.1-impl \
-    android.hardware.health@2.1-impl.recovery \
-    android.hardware.health@2.1-service
+    android.hardware.health-service.samsung \
+    android.hardware.health-service.samsung-recovery
 
 # HIDL
 PRODUCT_PACKAGES += \