From 962e580a3ca40e8440d849176dd32fd21b03368f Mon Sep 17 00:00:00 2001 From: Adam Shih Date: Mon, 27 Sep 2021 09:42:14 +0800 Subject: [PATCH] review hal_wlc Bug: 201230944 Test: boot with hal_wlc started Change-Id: I81d5ff7ed4745fb6d760f59c6acc50cc1732c95e --- legacy/file_contexts | 2 -- legacy/genfs_contexts | 38 -------------------------- legacy/hwservice.te | 3 -- legacy/hwservice_contexts | 3 -- legacy/platform_app.te | 3 -- whitechapel_pro/file_contexts | 1 + {legacy => whitechapel_pro}/hal_wlc.te | 6 +--- whitechapel_pro/hwservice.te | 3 ++ whitechapel_pro/hwservice_contexts | 3 ++ 9 files changed, 8 insertions(+), 54 deletions(-) rename {legacy => whitechapel_pro}/hal_wlc.te (67%) diff --git a/legacy/file_contexts b/legacy/file_contexts index c774cea4..b012c7cf 100644 --- a/legacy/file_contexts +++ b/legacy/file_contexts @@ -18,8 +18,6 @@ /(vendor|system/vendor)/bin/hw/android\.hardware\.boot@1\.[0-2]-service-gs201 u:object_r:hal_bootctl_default_exec:s0 /(vendor|system/vendor)/bin/hw/android\.hardware\.dumpstate@1\.1-service\.gs201 u:object_r:hal_dumpstate_default_exec:s0 /(vendor|system/vendor)/bin/hw/android\.hardware\.power\.stats@1\.0-service\.gs201 u:object_r:hal_power_stats_default_exec:s0 -# Wireless charger HAL -/(vendor|system/vendor)/bin/hw/vendor\.google\.wireless_charger@1\.3-service-vendor u:object_r:hal_wlc_exec:s0 # # Exynos Devices diff --git a/legacy/genfs_contexts b/legacy/genfs_contexts index 51dcf58b..c6c005b1 100644 --- a/legacy/genfs_contexts +++ b/legacy/genfs_contexts @@ -1,46 +1,8 @@ # WiFi genfscon sysfs /wifi u:object_r:sysfs_wifi:s0 -# Battery -genfscon sysfs /devices/platform/google,battery/power_supply/battery u:object_r:sysfs_batteryinfo:s0 -genfscon sysfs /devices/platform/google,cpm/power_supply u:object_r:sysfs_batteryinfo:s0 -genfscon sysfs /devices/platform/google,charger u:object_r:sysfs_batteryinfo:s0 -# Slider -genfscon sysfs /devices/platform/10d50000.hsi2c/i2c-8/8-0050 u:object_r:sysfs_batteryinfo:s0 -genfscon sysfs /devices/platform/10d50000.hsi2c/i2c-8/8-0050/power_supply u:object_r:sysfs_batteryinfo:s0 -genfscon sysfs /devices/platform/10d10000.hsi2c/i2c-7/i2c-p9412 u:object_r:sysfs_wlc:s0 -genfscon sysfs /devices/platform/10d10000.hsi2c/i2c-7/i2c-p9412/power_supply u:object_r:sysfs_batteryinfo:s0 -# Whitefin -genfscon sysfs /devices/platform/10d50000.hsi2c/i2c-5/5-0050 u:object_r:sysfs_batteryinfo:s0 -genfscon sysfs /devices/platform/10d50000.hsi2c/i2c-5/5-0050/power_supply u:object_r:sysfs_batteryinfo:s0 -# R4 / P7 LunchBox -genfscon sysfs /devices/platform/10d50000.hsi2c/i2c-6/i2c-max77759tcpc u:object_r:sysfs_batteryinfo:s0 -genfscon sysfs /devices/platform/10d50000.hsi2c/i2c-6/i2c-max77759tcpc/power_supply u:object_r:sysfs_batteryinfo:s0 -genfscon sysfs /devices/platform/10970000.hsi2c/i2c-5/i2c-p9412 u:object_r:sysfs_wlc:s0 -genfscon sysfs /devices/platform/10970000.hsi2c/i2c-5/i2c-p9412/power_supply u:object_r:sysfs_batteryinfo:s0 -genfscon sysfs /devices/platform/10d50000.hsi2c/i2c-6/6-0069/power_supply u:object_r:sysfs_batteryinfo:s0 -genfscon sysfs /devices/platform/10d50000.hsi2c/i2c-6/6-0036/power_supply u:object_r:sysfs_batteryinfo:s0 -genfscon sysfs /devices/platform/10d50000.hsi2c/i2c-6/6-0057/power_supply u:object_r:sysfs_batteryinfo:s0 -genfscon sysfs /devices/platform/10970000.hsi2c/i2c-5/5-0050/eeprom u:object_r:sysfs_batteryinfo:s0 -genfscon sysfs /devices/platform/10970000.hsi2c/i2c-5/5-0061/power_supply u:object_r:sysfs_batteryinfo:s0 -genfscon sysfs /devices/platform/10970000.hsi2c/i2c-5/5-0036/power_supply u:object_r:sysfs_batteryinfo:s0 genfscon sysfs /devices/platform/10d30000.spi/spi_master/spi10/spi10.0/uwb/power_stats u:object_r:sysfs_power_stats:s0 -# O6 -genfscon sysfs /devices/platform/10d50000.hsi2c/i2c-5/i2c-max77759tcpc u:object_r:sysfs_batteryinfo:s0 -genfscon sysfs /devices/platform/10d50000.hsi2c/i2c-5/i2c-max77759tcpc/power_supply u:object_r:sysfs_batteryinfo:s0 -genfscon sysfs /devices/platform/10970000.hsi2c/i2c-4/i2c-p9412 u:object_r:sysfs_wlc:s0 -genfscon sysfs /devices/platform/10970000.hsi2c/i2c-4/i2c-p9412/power_supply u:object_r:sysfs_batteryinfo:s0 -genfscon sysfs /devices/platform/10d50000.hsi2c/i2c-5/5-0069/power_supply u:object_r:sysfs_batteryinfo:s0 -genfscon sysfs /devices/platform/10d50000.hsi2c/i2c-5/5-0036/power_supply u:object_r:sysfs_batteryinfo:s0 -genfscon sysfs /devices/platform/10d50000.hsi2c/i2c-5/5-0057/power_supply u:object_r:sysfs_batteryinfo:s0 -genfscon sysfs /devices/platform/10970000.hsi2c/i2c-4/4-0050/eeprom u:object_r:sysfs_batteryinfo:s0 - -genfscon sysfs /devices/platform/10d50000.hsi2c/i2c-7/i2c-max77759tcpc u:object_r:sysfs_batteryinfo:s0 -genfscon sysfs /devices/platform/10d50000.hsi2c/i2c-7/i2c-max77759tcpc/power_supply u:object_r:sysfs_batteryinfo:s0 -genfscon sysfs /devices/platform/10d50000.hsi2c/i2c-7/7-0069/power_supply u:object_r:sysfs_batteryinfo:s0 -genfscon sysfs /devices/platform/10d50000.hsi2c/i2c-7/7-0036/power_supply u:object_r:sysfs_batteryinfo:s0 - # Storage genfscon debugfs /f2fs u:object_r:debugfs_f2fs:s0 genfscon proc /fs/f2fs u:object_r:proc_f2fs:s0 diff --git a/legacy/hwservice.te b/legacy/hwservice.te index b72da6e8..edb3763c 100644 --- a/legacy/hwservice.te +++ b/legacy/hwservice.te @@ -4,9 +4,6 @@ type hal_vendor_surfaceflinger_hwservice, hwservice_manager_type; # rild service type hal_exynos_rild_hwservice, hwservice_manager_type; -# WLC -type hal_wlc_hwservice, hwservice_manager_type; - # Bluetooth HAL extension type hal_bluetooth_coexistence_hwservice, hwservice_manager_type, vendor_hwservice_type; diff --git a/legacy/hwservice_contexts b/legacy/hwservice_contexts index 901c6af8..4895c5b3 100644 --- a/legacy/hwservice_contexts +++ b/legacy/hwservice_contexts @@ -6,9 +6,6 @@ vendor.samsung_slsi.hardware.configstore::IExynosHWCConfigs u:object_r:hal_conf android.hardware.media.c2::IComponentStore u:object_r:hal_codec2_hwservice:s0 android.hardware.media.c2::IConfigurable u:object_r:hal_codec2_hwservice:s0 -# Wireless charger hal -vendor.google.wireless_charger::IWirelessCharger u:object_r:hal_wlc_hwservice:s0 - # Bluetooth HAL extension hardware.google.bluetooth.bt_channel_avoidance::IBTChannelAvoidance u:object_r:hal_bluetooth_coexistence_hwservice:s0 hardware.google.bluetooth.sar::IBluetoothSar u:object_r:hal_bluetooth_coexistence_hwservice:s0 diff --git a/legacy/platform_app.te b/legacy/platform_app.te index d8fde3a3..acff39cd 100644 --- a/legacy/platform_app.te +++ b/legacy/platform_app.te @@ -1,9 +1,6 @@ binder_call(platform_app, rild) allow platform_app hal_exynos_rild_hwservice:hwservice_manager find; -allow platform_app hal_wlc_hwservice:hwservice_manager find; -binder_call(platform_app, hal_wlc) - allow platform_app nfc_service:service_manager find; allow platform_app uwb_service:service_manager find; diff --git a/whitechapel_pro/file_contexts b/whitechapel_pro/file_contexts index 0b0b707b..ee09864b 100644 --- a/whitechapel_pro/file_contexts +++ b/whitechapel_pro/file_contexts @@ -16,6 +16,7 @@ /vendor/bin/init\.radio\.sh u:object_r:init_radio_exec:s0 /vendor/bin/hw/android\.hardware\.biometrics\.fingerprint-service\.goodix u:object_r:hal_fingerprint_default_exec:s0 /vendor/bin/hw/android\.hardware\.nfc@1\.2-service\.st u:object_r:hal_nfc_default_exec:s0 +/vendor/bin/hw/vendor\.google\.wireless_charger@1\.3-service-vendor u:object_r:hal_wlc_exec:s0 # Vendor Firmwares /vendor/firmware(/.*)? u:object_r:vendor_fw_file:s0 diff --git a/legacy/hal_wlc.te b/whitechapel_pro/hal_wlc.te similarity index 67% rename from legacy/hal_wlc.te rename to whitechapel_pro/hal_wlc.te index 891853c9..bd72d1dc 100644 --- a/legacy/hal_wlc.te +++ b/whitechapel_pro/hal_wlc.te @@ -6,11 +6,7 @@ hwbinder_use(hal_wlc) add_hwservice(hal_wlc, hal_wlc_hwservice) get_prop(hal_wlc, hwservicemanager_prop) -r_dir_file(hal_wlc, sysfs_batteryinfo) -allow hal_wlc sysfs_wlc:dir r_dir_perms; -allow hal_wlc sysfs_wlc:file rw_file_perms; - allow hal_wlc self:netlink_kobject_uevent_socket create_socket_perms_no_ioctl; binder_call(hal_wlc, platform_app) -binder_call(hal_wlc, system_app) \ No newline at end of file +binder_call(hal_wlc, system_app) diff --git a/whitechapel_pro/hwservice.te b/whitechapel_pro/hwservice.te index 9c041ba7..cdae523d 100644 --- a/whitechapel_pro/hwservice.te +++ b/whitechapel_pro/hwservice.te @@ -4,3 +4,6 @@ type hal_vendor_oem_hwservice, hwservice_manager_type; # GRIL service type hal_radioext_hwservice, hwservice_manager_type; +# WLC +type hal_wlc_hwservice, hwservice_manager_type; + diff --git a/whitechapel_pro/hwservice_contexts b/whitechapel_pro/hwservice_contexts index 6453a566..ab89ba82 100644 --- a/whitechapel_pro/hwservice_contexts +++ b/whitechapel_pro/hwservice_contexts @@ -1,6 +1,9 @@ # dmd HAL vendor.samsung_slsi.telephony.hardware.oemservice::IOemService u:object_r:hal_vendor_oem_hwservice:s0 +# Wireless charger hal +vendor.google.wireless_charger::IWirelessCharger u:object_r:hal_wlc_hwservice:s0 + # rild HAL vendor.samsung_slsi.telephony.hardware.radioExternal::IOemSlsiRadioExternal u:object_r:hal_exynos_rild_hwservice:s0