From 703c0edf61a320b4720cc308bf14a22988cd954c Mon Sep 17 00:00:00 2001 From: roynatech2544 Date: Sun, 24 Oct 2021 21:55:10 +0900 Subject: [PATCH] universal7885: Fix another merge issue * /vendor/firmware/ --- .../default/vendor.eureka.hardware.battery@1.0.xml | 11 +++++++++++ universal7885-common/sepolicy/vendor/file_contexts | 7 ++++--- .../sepolicy/vendor/hal_battery_default.te | 1 + 3 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 universal7885-common/interfaces/hardware/battery/1.0/default/vendor.eureka.hardware.battery@1.0.xml diff --git a/universal7885-common/interfaces/hardware/battery/1.0/default/vendor.eureka.hardware.battery@1.0.xml b/universal7885-common/interfaces/hardware/battery/1.0/default/vendor.eureka.hardware.battery@1.0.xml new file mode 100644 index 0000000..af50bb7 --- /dev/null +++ b/universal7885-common/interfaces/hardware/battery/1.0/default/vendor.eureka.hardware.battery@1.0.xml @@ -0,0 +1,11 @@ + + + vendor.eureka.hardware.battery + hwbinder + 1.0 + + IBattery + default + + + diff --git a/universal7885-common/sepolicy/vendor/file_contexts b/universal7885-common/sepolicy/vendor/file_contexts index 0b066dd..de929ca 100644 --- a/universal7885-common/sepolicy/vendor/file_contexts +++ b/universal7885-common/sepolicy/vendor/file_contexts @@ -209,8 +209,9 @@ /(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\.keymaster@[0-9]\.[0-9]-service\.samsung u:object_r:hal_keymaster_default_exec:s0 /(vendor|system/vendor)/bin/hw/android\.hardware\.nfc@[0-9]\.[0-9]-service\.samsung u:object_r:hal_nfc_default_exec:s0 -/(vendor|system/vendor)/bin/hw/android\.hardware\.usb@[0-9]\.[0-9]-service\.typec u:object_r:hal_usb_default_exec:s0 +/(vendor|system/vendor)/bin/hw/android\.hardware\.usb@[0-9]\.[0-9]-service\.exynos7884B u:object_r:hal_usb_default_exec:s0 /(vendor|system/vendor)/bin/hw/vendor\.samsung\.hardware\.gnss@[0-9]\.[0-9]-service u:object_r:hal_gnss_default_exec:s0 -/(vendor|system/vendor)/bin/hw/android\.hardware\.sensors@2\.1-service\.samsung-multihal u:object_r:hal_sensors_default_exec:s0 +/(vendor|system/vendor)/firmware(/.*)? u:object_r:vendor_firmware_file:s0 + # SamsungParts -/(vendor/system/vendor)/bin/hw/vendor.eureka.hardware.battery@1.0-service u:object_r:hal_battery_default_exec:s0 +/(vendor|system/vendor)/bin/hw/vendor\.eureka\.hardware\.battery@1\.0-service u:object_r:hal_battery_default_exec:s0 diff --git a/universal7885-common/sepolicy/vendor/hal_battery_default.te b/universal7885-common/sepolicy/vendor/hal_battery_default.te index b435692..1bd4afe 100644 --- a/universal7885-common/sepolicy/vendor/hal_battery_default.te +++ b/universal7885-common/sepolicy/vendor/hal_battery_default.te @@ -1,3 +1,4 @@ type hal_battery_default, domain; type hal_battery_default_exec, exec_type, file_type, vendor_file_type; +add_hwservice(hal_battery_default, hal_battery_hwservice); init_daemon_domain(hal_battery_default);