diff --git a/legacy/zuma/vendor/file.te b/legacy/zuma/vendor/file.te index 87308f3..ad6451b 100644 --- a/legacy/zuma/vendor/file.te +++ b/legacy/zuma/vendor/file.te @@ -21,7 +21,6 @@ type vendor_charger_debugfs, fs_type, debugfs_type; type vendor_votable_debugfs, fs_type, debugfs_type; type vendor_battery_debugfs, fs_type, debugfs_type; type vendor_pm_genpd_debugfs, fs_type, debugfs_type; -type vendor_usb_debugfs, fs_type, debugfs_type; type vendor_maxfg_debugfs, fs_type, debugfs_type; # WLC diff --git a/legacy/zuma/vendor/file_contexts b/legacy/zuma/vendor/file_contexts index 7aba188..7980516 100644 --- a/legacy/zuma/vendor/file_contexts +++ b/legacy/zuma/vendor/file_contexts @@ -3,8 +3,6 @@ /vendor/bin/hw/android\.hardware\.boot@1\.2-service-zumapro u:object_r:hal_bootctl_default_exec:s0 /vendor/bin/hw/android\.hardware\.power\.stats-service\.pixel u:object_r:hal_power_stats_default_exec:s0 /vendor/bin/hw/android\.hardware\.secure_element-service\.thales u:object_r:hal_secure_element_st54spi_aidl_exec:s0 -/vendor/bin/hw/android\.hardware\.usb-service u:object_r:hal_usb_impl_exec:s0 -/vendor/bin/hw/android\.hardware\.usb\.gadget-service u:object_r:hal_usb_gadget_impl_exec:s0 /vendor/bin/hw/android\.hardware\.secure_element@1\.2-uicc-service u:object_r:hal_secure_element_uicc_exec:s0 /vendor/bin/hw/android\.hardware\.secure_element-service.uicc u:object_r:hal_secure_element_uicc_exec:s0 /vendor/bin/hw/android\.hardware\.composer\.hwc3-service\.pixel u:object_r:hal_graphics_composer_default_exec:s0 @@ -85,8 +83,6 @@ /dev/block/platform/13200000\.ufs/by-name/ufs_internal u:object_r:ufs_internal_block_device:s0 /dev/gxp u:object_r:gxp_device:s0 /dev/mali0 u:object_r:gpu_device:s0 -/dev/logbuffer_tcpm u:object_r:logbuffer_device:s0 -/dev/logbuffer_usbpd u:object_r:logbuffer_device:s0 /dev/logbuffer_ssoc u:object_r:logbuffer_device:s0 /dev/logbuffer_wireless u:object_r:logbuffer_device:s0 /dev/logbuffer_ttf u:object_r:logbuffer_device:s0 diff --git a/legacy/zuma/vendor/genfs_contexts b/legacy/zuma/vendor/genfs_contexts index a9f67d5..00fe279 100644 --- a/legacy/zuma/vendor/genfs_contexts +++ b/legacy/zuma/vendor/genfs_contexts @@ -29,7 +29,6 @@ genfscon debugfs /max77779_pmic u:object genfscon debugfs /gvotables u:object_r:vendor_votable_debugfs:s0 genfscon debugfs /google_battery u:object_r:vendor_battery_debugfs:s0 genfscon debugfs /pm_genpd/pm_genpd_summary u:object_r:vendor_pm_genpd_debugfs:s0 -genfscon debugfs /usb u:object_r:vendor_usb_debugfs:s0 genfscon debugfs /maxfg u:object_r:vendor_maxfg_debugfs:s0 genfscon debugfs /max77779fg u:object_r:vendor_maxfg_debugfs:s0 @@ -137,7 +136,6 @@ genfscon sysfs /devices/platform/13120000.pcie/link_stats/pll_lock_average # Battery genfscon sysfs /devices/platform/google,battery/power_supply/battery u:object_r:sysfs_batteryinfo:s0 genfscon sysfs /devices/platform/google,cpm u:object_r:sysfs_batteryinfo:s0 -genfscon sysfs /devices/platform/108d0000.hsi2c/i2c-6/6-0025/typec u:object_r:sysfs_batteryinfo:s0 genfscon sysfs /devices/platform/108d0000.hsi2c/i2c-6/6-0025/power_supply u:object_r:sysfs_batteryinfo:s0 genfscon sysfs /devices/platform/108d0000.hsi2c/i2c-6/6-0036/power_supply u:object_r:sysfs_batteryinfo:s0 genfscon sysfs /devices/platform/108d0000.hsi2c/i2c-6/6-0069/power_supply u:object_r:sysfs_batteryinfo:s0 @@ -153,7 +151,6 @@ genfscon sysfs /devices/platform/10ca0000.hsi2c/i2c-10/10-0057/registers_dump genfscon sysfs /devices/platform/10ca0000.hsi2c/i2c-10/10-006e/power_supply u:object_r:sysfs_batteryinfo:s0 genfscon sysfs /devices/platform/10ca0000.hsi2c/i2c-10/10-006e/registers_dump u:object_r:sysfs_power_dump:s0 genfscon sysfs /devices/platform/10ca0000.hsi2c/i2c-10/10-0050/eeprom u:object_r:sysfs_batteryinfo:s0 -genfscon sysfs /devices/platform/10cb0000.hsi2c/i2c-11/11-0025/typec u:object_r:sysfs_batteryinfo:s0 genfscon sysfs /devices/platform/10cb0000.hsi2c/i2c-11/11-0025/power_supply u:object_r:sysfs_batteryinfo:s0 genfscon sysfs /devices/platform/10cb0000.hsi2c/i2c-11/11-0036/power_supply u:object_r:sysfs_batteryinfo:s0 genfscon sysfs /devices/platform/10cb0000.hsi2c/i2c-11/11-0069/power_supply u:object_r:sysfs_batteryinfo:s0 @@ -175,7 +172,6 @@ genfscon sysfs /devices/platform/108d0000.hsi2c/i2c-6/6-0069/power_supply/dc/pow genfscon sysfs /devices/platform/108d0000.hsi2c/i2c-6/6-0069/power_supply/main-charger/power/wakeup u:object_r:sysfs_wakeup:s0 genfscon sysfs /devices/platform/108d0000.hsi2c/i2c-6/6-0025/wakeup u:object_r:sysfs_wakeup:s0 genfscon sysfs /devices/platform/108d0000.hsi2c/i2c-6/6-0025/power/wakeup u:object_r:sysfs_wakeup:s0 -genfscon sysfs /devices/platform/108d0000.hsi2c/i2c-6/6-0025/power_supply/usb/power/wakeup u:object_r:sysfs_wakeup:s0 genfscon sysfs /devices/platform/108d0000.hsi2c/i2c-6/6-0025/power_supply/tcpm-source-psy-6-0025/power/wakeup u:object_r:sysfs_wakeup:s0 genfscon sysfs /devices/platform/108d0000.hsi2c/i2c-6/6-0036/power_supply/max77779fg/power/wakeup u:object_r:sysfs_wakeup:s0 genfscon sysfs /devices/platform/10c90000.hsi2c/i2c-9/9-003b/wakeup u:object_r:sysfs_wakeup:s0 @@ -187,17 +183,14 @@ genfscon sysfs /devices/platform/10cb0000.hsi2c/i2c-11/11-0069/power_supply/dc/p genfscon sysfs /devices/platform/10cb0000.hsi2c/i2c-11/11-0069/power_supply/main-charger/power/wakeup u:object_r:sysfs_wakeup:s0 genfscon sysfs /devices/platform/10cb0000.hsi2c/i2c-11/11-0025/wakeup u:object_r:sysfs_wakeup:s0 genfscon sysfs /devices/platform/10cb0000.hsi2c/i2c-11/11-0025/power/wakeup u:object_r:sysfs_wakeup:s0 -genfscon sysfs /devices/platform/10cb0000.hsi2c/i2c-11/11-0025/power_supply/usb/power/wakeup u:object_r:sysfs_wakeup:s0 genfscon sysfs /devices/platform/10cb0000.hsi2c/i2c-11/11-0025/power_supply/tcpm-source-psy-6-0025/power/wakeup u:object_r:sysfs_wakeup:s0 genfscon sysfs /devices/platform/10cb0000.hsi2c/i2c-11/11-0036/power_supply/max77779fg/power/wakeup u:object_r:sysfs_wakeup:s0 -genfscon sysfs /devices/platform/11210000.usb/11210000.dwc3/wakeup/wakeup u:object_r:sysfs_wakeup:s0 genfscon sysfs /devices/platform/13120000.pcie/pci0001:00/0001:00:00.0/0001:01:00.0/wakeup/wakeup u:object_r:sysfs_wakeup:s0 genfscon sysfs /devices/platform/17000000.aoc/com.google.usf.non_wake_up/wakeup/wakeup u:object_r:sysfs_wakeup:s0 genfscon sysfs /devices/platform/17000000.aoc/com.google.usf/wakeup/wakeup u:object_r:sysfs_wakeup:s0 genfscon sysfs /devices/platform/17000000.aoc/com.google.chre.non_wake_up/wakeup u:object_r:sysfs_wakeup:s0 genfscon sysfs /devices/platform/17000000.aoc/com.google.chre/wakeup u:object_r:sysfs_wakeup:s0 -genfscon sysfs /devices/platform/17000000.aoc/usb_control/wakeup u:object_r:sysfs_wakeup:s0 genfscon sysfs /devices/platform/17000000.aoc/wakeup u:object_r:sysfs_wakeup:s0 genfscon sysfs /devices/platform/acpm_mfd_bus@15500000/i2c-7/7-001f/wakeup u:object_r:sysfs_wakeup:s0 genfscon sysfs /devices/platform/acpm_mfd_bus@15500000/i2c-7/7-001f/power/wakeup u:object_r:sysfs_wakeup:s0 diff --git a/legacy/zuma/vendor/property.te b/legacy/zuma/vendor/property.te index 8ef51a8..90efd65 100644 --- a/legacy/zuma/vendor/property.te +++ b/legacy/zuma/vendor/property.te @@ -5,9 +5,6 @@ vendor_internal_prop(vendor_fingerprint_prop) vendor_internal_prop(vendor_battery_defender_prop) vendor_internal_prop(vendor_shutdown_prop) -# USB -vendor_internal_prop(vendor_usb_config_prop) - # Dynamic sensor vendor_internal_prop(vendor_dynamic_sensor_prop) diff --git a/legacy/zuma/vendor/property_contexts b/legacy/zuma/vendor/property_contexts index e27170d..f8d3e80 100644 --- a/legacy/zuma/vendor/property_contexts +++ b/legacy/zuma/vendor/property_contexts @@ -12,10 +12,6 @@ persist.vendor.qfp. u:object_r:vendor_fingerprint_prop:s0 vendor.battery.defender. u:object_r:vendor_battery_defender_prop:s0 persist.vendor.shutdown. u:object_r:vendor_shutdown_prop:s0 -# USB -persist.vendor.usb. u:object_r:vendor_usb_config_prop:s0 -vendor.usb. u:object_r:vendor_usb_config_prop:s0 - # Dynamic sensor vendor.dynamic_sensor. u:object_r:vendor_dynamic_sensor_prop:s0 diff --git a/legacy/zuma/vendor/vendor_init.te b/legacy/zuma/vendor/vendor_init.te index 2071850..73df26d 100644 --- a/legacy/zuma/vendor/vendor_init.te +++ b/legacy/zuma/vendor/vendor_init.te @@ -23,9 +23,6 @@ set_prop(vendor_init, vendor_nfc_prop) # SecureElement vendor property set_prop(vendor_init, vendor_secure_element_prop) -# USB property -set_prop(vendor_init, vendor_usb_config_prop) - # Mali set_prop(vendor_init, vendor_arm_runtime_option_prop) set_prop(vendor_init, vendor_ssrdump_prop) diff --git a/vendor/file.te b/vendor/file.te index bc6ca4a..9c5f786 100644 --- a/vendor/file.te +++ b/vendor/file.te @@ -6,6 +6,7 @@ type sysfs_pca, sysfs_type, fs_type; # debugfs type vendor_regmap_debugfs, fs_type, debugfs_type; +type vendor_usb_debugfs, fs_type, debugfs_type; # Data type uwb_vendor_data_file, file_type, data_file_type, app_data_file_type; diff --git a/vendor/file_contexts b/vendor/file_contexts index e32c8fa..13d432b 100644 --- a/vendor/file_contexts +++ b/vendor/file_contexts @@ -2,6 +2,8 @@ /vendor/bin/hw/android\.hardware\.qorvo\.uwb\.service u:object_r:hal_uwb_vendor_default_exec:s0 /vendor/bin/init_uwb_calib u:object_r:vendor_uwb_init_exec:s0 /vendor/bin/dump/dump_power u:object_r:dump_power_exec:s0 +/vendor/bin/hw/android\.hardware\.usb-service u:object_r:hal_usb_impl_exec:s0 +/vendor/bin/hw/android\.hardware\.usb\.gadget-service u:object_r:hal_usb_gadget_impl_exec:s0 # Vendor /data/vendor/uwb(/.*)? u:object_r:uwb_data_vendor:s0 @@ -19,4 +21,6 @@ /dev/logbuffer_maxfg_secondary u:object_r:logbuffer_device:s0 /dev/logbuffer_maxfg_base_monitor u:object_r:logbuffer_device:s0 /dev/logbuffer_maxfg_secondary_monitor u:object_r:logbuffer_device:s0 +/dev/logbuffer_tcpm u:object_r:logbuffer_device:s0 +/dev/logbuffer_usbpd u:object_r:logbuffer_device:s0 diff --git a/vendor/genfs_contexts b/vendor/genfs_contexts index c73793e..6538cf8 100644 --- a/vendor/genfs_contexts +++ b/vendor/genfs_contexts @@ -2,9 +2,12 @@ genfscon sysfs /devices/platform/google,charger u:object_r:sysfs_batteryinfo:s0 genfscon sysfs /devices/platform/10c90000.hsi2c/i2c-9/9-006e/chg_stats u:object_r:sysfs_pca:s0 genfscon sysfs /devices/platform/10ca0000.hsi2c/i2c-10/10-006e/chg_stats u:object_r:sysfs_pca:s0 +genfscon sysfs /devices/platform/108d0000.hsi2c/i2c-6/6-0025/typec u:object_r:sysfs_batteryinfo:s0 +genfscon sysfs /devices/platform/10cb0000.hsi2c/i2c-11/11-0025/typec u:object_r:sysfs_batteryinfo:s0 # debugfs genfscon debugfs /regmap u:object_r:vendor_regmap_debugfs:s0 +genfscon debugfs /usb u:object_r:vendor_usb_debugfs:s0 # GPU genfscon sysfs /devices/platform/1f000000.mali/hint_min_freq u:object_r:sysfs_gpu:s0 @@ -19,9 +22,13 @@ genfscon sysfs /devices/platform/10c90000.hsi2c/i2c-9/9-0043 # wake up nodes genfscon sysfs /devices/platform/11210000.usb/11210000.dwc3/wakeup u:object_r:sysfs_wakeup:s0 +genfscon sysfs /devices/platform/11210000.usb/11210000.dwc3/wakeup/wakeup u:object_r:sysfs_wakeup:s0 genfscon sysfs /devices/platform/11210000.usb/11210000.dwc3/xhci-hcd-exynos.8.auto/wakeup u:object_r:sysfs_wakeup:s0 genfscon sysfs /devices/platform/11210000.usb/11210000.dwc3/xhci-hcd-exynos.8.auto/usb1/wakeup u:object_r:sysfs_wakeup:s0 genfscon sysfs /devices/platform/11210000.usb/11210000.dwc3/xhci-hcd-exynos.8.auto/usb2/wakeup u:object_r:sysfs_wakeup:s0 +genfscon sysfs /devices/platform/17000000.aoc/usb_control/wakeup u:object_r:sysfs_wakeup:s0 +genfscon sysfs /devices/platform/108d0000.hsi2c/i2c-6/6-0025/power_supply/usb/power/wakeup u:object_r:sysfs_wakeup:s0 +genfscon sysfs /devices/platform/10cb0000.hsi2c/i2c-11/11-0025/power_supply/usb/power/wakeup u:object_r:sysfs_wakeup:s0 # GPU genfscon sysfs /devices/platform/1f000000.mali/cur_freq u:object_r:sysfs_gpu:s0 diff --git a/legacy/zuma/vendor/hal_usb_gadget_impl.te b/vendor/hal_usb_gadget_impl.te similarity index 100% rename from legacy/zuma/vendor/hal_usb_gadget_impl.te rename to vendor/hal_usb_gadget_impl.te diff --git a/legacy/zuma/vendor/hal_usb_impl.te b/vendor/hal_usb_impl.te similarity index 91% rename from legacy/zuma/vendor/hal_usb_impl.te rename to vendor/hal_usb_impl.te index 15d74c5..ff8ea5a 100644 --- a/legacy/zuma/vendor/hal_usb_impl.te +++ b/vendor/hal_usb_impl.te @@ -7,6 +7,7 @@ hal_server_domain(hal_usb_impl, hal_usb_gadget) allow hal_usb_impl sysfs_batteryinfo:dir r_dir_perms; allow hal_usb_impl sysfs_batteryinfo:file rw_file_perms; +get_prop(hal_usb_impl, vendor_usb_config_prop) # Needed for monitoring usb port temperature allow hal_usb_impl self:capability2 wake_alarm; diff --git a/vendor/property.te b/vendor/property.te new file mode 100644 index 0000000..34029be --- /dev/null +++ b/vendor/property.te @@ -0,0 +1,3 @@ +# USB +vendor_internal_prop(vendor_usb_config_prop) + diff --git a/vendor/property_contexts b/vendor/property_contexts new file mode 100644 index 0000000..43d498d --- /dev/null +++ b/vendor/property_contexts @@ -0,0 +1,4 @@ +# USB +persist.vendor.usb. u:object_r:vendor_usb_config_prop:s0 +vendor.usb. u:object_r:vendor_usb_config_prop:s0 + diff --git a/vendor/vendor_init.te b/vendor/vendor_init.te new file mode 100644 index 0000000..c195c40 --- /dev/null +++ b/vendor/vendor_init.te @@ -0,0 +1,2 @@ +# USB property +set_prop(vendor_init, vendor_usb_config_prop)