Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: I7d27c3d1aa5f6e5e666b05e157333fd217f776c0
Change-Id: I7b1236697d5737465c6c17cbb139f628baff5d2d
This commit is contained in:
Xin Li 2024-09-05 17:02:39 -07:00
commit f503a505a5
3 changed files with 2 additions and 1 deletions

View file

@ -8,7 +8,6 @@ BOARD_SEPOLICY_DIRS += device/google/tangorpro-sepolicy/fingerprint_capacitance
# for mediashell
PRODUCT_PUBLIC_SEPOLICY_DIRS += device/google/atv/audio_proxy/sepolicy/public
BOARD_VENDOR_SEPOLICY_DIRS += device/google/atv/audio_proxy/sepolicy/vendor
PRODUCT_PRIVATE_SEPOLICY_DIRS += vendor/google/gms/src/sepolicy/tv
# system_ext
SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS += device/google/tangorpro-sepolicy/system_ext/private

View file

@ -7,6 +7,7 @@ genfscon sysfs /devices/platform/10d10000.spi/spi_master/spi0/spi0.0 u:object_
# system suspend wakeup files
genfscon sysfs /devices/platform/google,dock/power_supply/dock/wakeup u:object_r:sysfs_wakeup:s0
genfscon sysfs /devices/platform/10d10000.spi/spi_master/spi0/spi0.0/power_supply/nvt-pen-battery/wakeup u:object_r:sysfs_wakeup:s0
genfscon sysfs /devices/platform/10d10000.spi/spi_master/spi0/spi0.0/power_supply/USI_Stylus_Battery/wakeup u:object_r:sysfs_wakeup:s0
genfscon sysfs /devices/platform/10d10000.spi/spi_master/spi0/spi0.0/input/input2/wakeup u:object_r:sysfs_wakeup:s0
genfscon sysfs /devices/platform/10d10000.spi/spi_master/spi0/spi0.0/wakeup u:object_r:sysfs_wakeup:s0

1
vendor/hal_health_default.te vendored Normal file
View file

@ -0,0 +1 @@
dontaudit hal_health_default sysfs_touch:dir *;