diff --git a/device_framework_matrix.xml b/device_framework_matrix.xml index f611469..dcf935b 100644 --- a/device_framework_matrix.xml +++ b/device_framework_matrix.xml @@ -103,14 +103,6 @@ default - - vendor.oneplus.hardware.charger - 1.0 - - ICharger - default - - vendor.oneplus.hardware.cwb 1.0 diff --git a/sepolicy/vendor/attributes b/sepolicy/vendor/attributes index b772f2e..8d180cf 100644 --- a/sepolicy/vendor/attributes +++ b/sepolicy/vendor/attributes @@ -3,10 +3,6 @@ attribute hal_cameraHIDL; attribute hal_cameraHIDL_client; attribute hal_cameraHIDL_server; -attribute hal_charger; -attribute hal_charger_client; -attribute hal_charger_server; - attribute hal_display; attribute hal_display_client; attribute hal_display_server; diff --git a/sepolicy/vendor/file_contexts b/sepolicy/vendor/file_contexts index 1486fae..7f4c369 100644 --- a/sepolicy/vendor/file_contexts +++ b/sepolicy/vendor/file_contexts @@ -39,14 +39,10 @@ /(vendor|system/vendor)/bin/hw/vendor\.lineage\.touch@1\.0-service\.oneplus u:object_r:hal_lineage_touch_default_exec:s0 /(vendor|system/vendor)/bin/hw/vendor\.oneplus\.hardware\.camera@1\.0-service u:object_r:hal_cameraHIDL_default_exec:s0 /(vendor|system/vendor)/bin/hw/vendor\.oneplus\.hardware\.CameraMDMHIDL@1\.0-service u:object_r:hal_cameraHIDL_default_exec:s0 -/(vendor|system/vendor)/bin/hw/vendor\.oneplus\.hardware\.charger@1\.0-service u:object_r:hal_charger_default_exec:s0 /(vendor|system/vendor)/bin/hw/vendor\.oneplus\.hardware\.display@1\.0-service u:object_r:hal_display_default_exec:s0 /(vendor|system/vendor)/bin/hw/vendor\.oneplus\.hardware\.param@1\.0-service u:object_r:hal_param_default_exec:s0 /(vendor|system/vendor)/bin/hw/vendor\.qti\.hardware\.vibrator\.service\.oneplus u:object_r:hal_vibrator_default_exec:s0 -# Init scripts -/vendor/bin/init.oplus_chg.sh u:object_r:vendor_qti_init_shell_exec:s0 - # OP1, OP2 files /mnt/vendor/op1(/.*)? u:object_r:op1_file:s0 /mnt/vendor/op2(/.*)? u:object_r:op2_file:s0 @@ -66,19 +62,12 @@ /sys/module/tpd(/.*)? u:object_r:sysfs_tpd:s0 # Sys files (health) -/sys/devices/platform/soc/soc:oplus,chg_gki/power_supply/(?!.*wakeup\d+).* u:object_r:vendor_sysfs_battery_supply:s0 -/sys/devices/platform/soc/soc:oplus,chg_intf/oplus_chg/(?!.*wakeup\d+).* u:object_r:vendor_sysfs_battery_supply:s0 -/sys/devices/platform/soc/soc:oplus,chg_intf/soc:oplus,chg_intf:oplus,common-charge/oplus_chg/(?!.*wakeup\d+).* u:object_r:vendor_sysfs_battery_supply:s0 -/sys/devices/platform/soc/soc:oplus,chg_intf/soc:oplus,chg_intf:oplus,wireless-charge/oplus_chg/(?!.*wakeup\d+).* u:object_r:vendor_sysfs_battery_supply:s0 # Sys files (wakeup) /sys/devices(/platform)?/soc/[0-9a-f]+.qcom,spmi/spmi-[0-9]+/spmi[0-9]+-[0-9]+/[0-9a-f]+.qcom,spmi:qcom,pmk[0-9]+@[0-9]+:pon_hlos@[0-9]+/wakeup/wakeup[0-9]+(/.*)? u:object_r:sysfs_wakeup:s0 /sys/devices(/platform)?/soc/[0-9a-f]+.qcom,spmi/spmi-[0-9]+/spmi[0-9]+-[0-9]+/[0-9a-f]+.qcom,spmi:qcom,pmk[0-9]+@[0-9]+:pon_pbs@[0-9]+/wakeup/wakeup[0-9]+(/.*)? u:object_r:sysfs_wakeup:s0 /sys/devices(/platform)?/soc/[0-9a-f]+.qcom,spmi/spmi-[0-9]+/spmi[0-9]+-[0-9]+/[0-9a-f]+.qcom,spmi:qcom,pmk[0-9]+@[0-9]+:rtc@[0-9]+/rtc/rtc[0-9]+/wakeup[0-9]+(/.*)? u:object_r:sysfs_wakeup:s0 /sys/devices(/platform)?/soc/[0-9a-f]+.qcom,spmi/spmi-[0-9]+/spmi[0-9]+-[0-9]+/[0-9a-f]+.qcom,spmi:qcom,pmk[0-9]+@[0-9]+:rtc@[0-9]+/wakeup/wakeup[0-9]+(/.*)? u:object_r:sysfs_wakeup:s0 -/sys/devices(/platform)?/soc/soc:oplus,chg_gki/power_supply/(battery|usb|wireless)/wakeup[0-9]+(/.*)? u:object_r:sysfs_wakeup:s0 -/sys/devices(/platform)?/soc/soc:oplus,chg_intf/oplus_chg/(usb|battery)/wakeup[0-9]+(/.*)? u:object_r:sysfs_wakeup:s0 -/sys/devices(/platform)?/soc/soc:oplus,chg_intf/soc:oplus,chg_intf:oplus,(wireless-charge|common-charge)/oplus_chg/(wireless|common)/wakeup[0-9]+(/.*)? u:object_r:sysfs_wakeup:s0 /sys/devices/virtual/fastrpc/adsprpc-smd-secure/wakeup[0-9]+(/.*)? u:object_r:sysfs_wakeup:s0 /sys/devices/virtual/fastrpc/adsprpc-smd/wakeup[0-9]+(/.*)? u:object_r:sysfs_wakeup:s0 /sys/devices/virtual/misc/msm_aac/wakeup[0-9]+(/.*)? u:object_r:sysfs_wakeup:s0 diff --git a/sepolicy/vendor/genfs_contexts b/sepolicy/vendor/genfs_contexts index 3913104..c496b53 100644 --- a/sepolicy/vendor/genfs_contexts +++ b/sepolicy/vendor/genfs_contexts @@ -36,7 +36,6 @@ genfscon sysfs /devices/platform/soc/abb0000.qcom,evass/subsys1/wakeup u:object_ genfscon sysfs /devices/platform/soc/abb0000.qcom,evass/wakeup u:object_r:sysfs_wakeup:s0 genfscon sysfs /devices/platform/soc/b0000000.qcom,cnss-qca6490/subsys10/wakeup u:object_r:sysfs_wakeup:s0 genfscon sysfs /devices/platform/soc/b0000000.qcom,cnss-qca6490/wakeup u:object_r:sysfs_wakeup:s0 -genfscon sysfs /devices/platform/soc/soc:oplus,chg_intf/soc:oplus,chg_intf:oplus,wireless-charge/wakeup u:object_r:sysfs_wakeup:s0 genfscon sysfs /devices/platform/soc/soc:qcom,ipa_fws/subsys0/wakeup u:object_r:sysfs_wakeup:s0 genfscon sysfs /devices/platform/soc/soc:qcom,ipa_fws/wakeup u:object_r:sysfs_wakeup:s0 genfscon sysfs /devices/platform/soc/soc:qcom,kgsl-hyp/subsys3/wakeup u:object_r:sysfs_wakeup:s0 diff --git a/sepolicy/vendor/hal_camera_default.te b/sepolicy/vendor/hal_camera_default.te index 77d4ece..09dde73 100644 --- a/sepolicy/vendor/hal_camera_default.te +++ b/sepolicy/vendor/hal_camera_default.te @@ -1,5 +1,4 @@ hal_client_domain(hal_camera_default, hal_cameraHIDL) -hal_client_domain(hal_camera_default, hal_charger) allow hal_camera_default mnt_vendor_file:dir w_dir_perms; allow hal_camera_default mnt_vendor_file:file create_file_perms; diff --git a/sepolicy/vendor/hal_charger.te b/sepolicy/vendor/hal_charger.te deleted file mode 100644 index 06d8257..0000000 --- a/sepolicy/vendor/hal_charger.te +++ /dev/null @@ -1,4 +0,0 @@ -binder_call(hal_charger_client, hal_charger_server) -binder_call(hal_charger_server, hal_charger_client) - -hal_attribute_hwservice(hal_charger, hal_charger_hwservice) diff --git a/sepolicy/vendor/hal_charger_default.te b/sepolicy/vendor/hal_charger_default.te deleted file mode 100644 index 143684c..0000000 --- a/sepolicy/vendor/hal_charger_default.te +++ /dev/null @@ -1,12 +0,0 @@ -type hal_charger_default, domain; -hal_server_domain(hal_charger_default, hal_charger) - -type hal_charger_default_exec, exec_type, vendor_file_type, file_type; -init_daemon_domain(hal_charger_default) - -add_hwservice(hal_charger_default, hal_charger_hwservice) - -hwbinder_use(hal_charger_default) - -allow hal_charger_default vendor_sysfs_battery_supply:dir r_dir_perms; -allow hal_charger_default vendor_sysfs_battery_supply:file rw_file_perms; diff --git a/sepolicy/vendor/hwservice_contexts b/sepolicy/vendor/hwservice_contexts index c890b18..482f6a0 100644 --- a/sepolicy/vendor/hwservice_contexts +++ b/sepolicy/vendor/hwservice_contexts @@ -6,6 +6,5 @@ vendor.oneplus.camera.CameraHIDL::IOnePlusCameraProvider u:obj vendor.oneplus.fingerprint.extension::IVendorFingerprintExtensions u:object_r:hal_fingerprint_hwservice:s0 vendor.oneplus.hardware.camera::IOnePlusCameraProvider u:object_r:hal_cameraHIDL_hwservice:s0 vendor.oneplus.hardware.CameraMDMHIDL::IOnePlusCameraMDM u:object_r:hal_cameraHIDL_hwservice:s0 -vendor.oneplus.hardware.charger::ICharger u:object_r:hal_charger_hwservice:s0 vendor.oneplus.hardware.display::IOneplusDisplay u:object_r:hal_display_hwservice:s0 vendor.oneplus.hardware.param::IOneplusParam u:object_r:hal_param_hwservice:s0