From 1845c09098b46e62b0978fb3395d25cc478a7b2b Mon Sep 17 00:00:00 2001 From: roynatech2544 Date: Mon, 17 Oct 2022 17:58:51 +0900 Subject: [PATCH] [SQUASH] universal7885: Revert health related commits Revert "universal7885: sepolicy: Address charger_vendor denial" This reverts commit f35e7ce2a6985b0b38c4eb25cb0c9f4cebfc099c. Revert "universal7885: Switch to health AIDL HAL" This reverts commit d80918f7b5d940f79a22f9945f16e79a5ff5a4a4. Revert "universal7885: health: remove unused namespace" This reverts commit 19139783b3ee55ded857aa258dcea9ea78e64e15. Revert "universal7885: Remove unused deps from health impl" This reverts commit 478b6f760cbbc5e53477cba9ca15be387400cc8b. Revert "universal7885: Implement health 2.1 hal" This reverts commit f90a9a09cf775a60005788a0b49eaa603889ebf5. --- universal7885-common/rootdir/etc/init.exynos7885.rc | 7 +++++++ universal7885-common/sepolicy/vendor/charger_vendor.te | 5 ----- universal7885-common/sepolicy/vendor/file_contexts | 1 - universal7885-common/universal7885-common.mk | 7 ++++--- 4 files changed, 11 insertions(+), 9 deletions(-) delete mode 100644 universal7885-common/sepolicy/vendor/charger_vendor.te diff --git a/universal7885-common/rootdir/etc/init.exynos7885.rc b/universal7885-common/rootdir/etc/init.exynos7885.rc index d7de3d6..939dac2 100644 --- a/universal7885-common/rootdir/etc/init.exynos7885.rc +++ b/universal7885-common/rootdir/etc/init.exynos7885.rc @@ -601,6 +601,13 @@ service tzts_service /vendor/bin/tzts_daemon group system disabled +service charger /system/bin/charger + class charger + user system + group system graphics input + capabilities SYS_BOOT + seclabel u:r:charger:s0 + # Start NFC on supported variants service nfc_hal_service /vendor/bin/hw/android.hardware.nfc@1.2-service.samsung override diff --git a/universal7885-common/sepolicy/vendor/charger_vendor.te b/universal7885-common/sepolicy/vendor/charger_vendor.te deleted file mode 100644 index a30fccb..0000000 --- a/universal7885-common/sepolicy/vendor/charger_vendor.te +++ /dev/null @@ -1,5 +0,0 @@ -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; -allow charger_vendor sysfs_fuelgauge:file r_file_perms; -allow charger_vendor sysfs_charger:file r_file_perms; diff --git a/universal7885-common/sepolicy/vendor/file_contexts b/universal7885-common/sepolicy/vendor/file_contexts index d397c28..ad8dac3 100644 --- a/universal7885-common/sepolicy/vendor/file_contexts +++ b/universal7885-common/sepolicy/vendor/file_contexts @@ -206,7 +206,6 @@ /(vendor|system/vendor)/bin/hw/macloader u:object_r:macloader_exec:s0 /(vendor|system/vendor)/bin/hw/android\.hardware\.power(@[0-9]\.[0-9])?-service\.samsung-libperfmgr u:object_r:hal_power_default_exec:s0 /(vendor|system/vendor)/bin/hw/android\.hardware\.vibrator(@[0-9].[0-9])?-service\.samsung u:object_r:hal_vibrator_default_exec:s0 -/(vendor|system/vendor)/bin/hw/android\.hardware\.health-service\.samsung u:object_r:hal_health_default_exec:s0 /(vendor|system/vendor)/bin/hw/android\.hardware\.drm@[0-9]\.[0-9]-service\.clearkey u:object_r:hal_drm_clearkey_exec:s0 /(vendor|system/vendor)/bin/hw/android\.hardware\.drm@[0-9]\.[0-9]-service\.widevine u:object_r:hal_drm_widevine_exec:s0 /(vendor|system/vendor)/bin/hw/android\.hardware\.memtrack-service\.samsung-mali u:object_r:hal_memtrack_default_exec:s0 diff --git a/universal7885-common/universal7885-common.mk b/universal7885-common/universal7885-common.mk index 981883b..7c17cab 100644 --- a/universal7885-common/universal7885-common.mk +++ b/universal7885-common/universal7885-common.mk @@ -102,7 +102,7 @@ PRODUCT_PACKAGES += \ # Charger PRODUCT_PACKAGES += \ - charger_res_images_vendor + libsuspend # Debug PRODUCT_PACKAGES += eklogger dlopener dlopener.vendor @@ -142,8 +142,9 @@ PRODUCT_PACKAGES += \ # Health PRODUCT_PACKAGES += \ - android.hardware.health-service.samsung \ - android.hardware.health-service.samsung-recovery + android.hardware.health@2.1-impl \ + android.hardware.health@2.1-impl.recovery \ + android.hardware.health@2.1-service # HIDL PRODUCT_PACKAGES += \