Merge Android 13 QPR2
Bug: 273316506 Merged-In: I09b67ca07d7f9573d77f64686fb818d4dc1753cc Change-Id: I4dfcfac354c52a6bf2828558dd44e1acca0b550a
This commit is contained in:
commit
f703b89586
13 changed files with 54 additions and 2 deletions
|
@ -25,8 +25,8 @@ allow hal_graphics_composer_default sysfs_leds:file rw_file_perms;
|
||||||
# allow HWC to get vendor_persist_sys_default_prop
|
# allow HWC to get vendor_persist_sys_default_prop
|
||||||
get_prop(hal_graphics_composer_default, vendor_persist_sys_default_prop)
|
get_prop(hal_graphics_composer_default, vendor_persist_sys_default_prop)
|
||||||
|
|
||||||
# allow HWC to get vendor_display_prop
|
# allow HWC to get/set vendor_display_prop
|
||||||
get_prop(hal_graphics_composer_default, vendor_display_prop)
|
set_prop(hal_graphics_composer_default, vendor_display_prop)
|
||||||
|
|
||||||
# allow HWC to get device_config_surface_flinger_native_boot_prop for adpf flags
|
# allow HWC to get device_config_surface_flinger_native_boot_prop for adpf flags
|
||||||
get_prop(hal_graphics_composer_default, device_config_surface_flinger_native_boot_prop)
|
get_prop(hal_graphics_composer_default, device_config_surface_flinger_native_boot_prop)
|
||||||
|
|
2
tracking_denials/kernel.te
Normal file
2
tracking_denials/kernel.te
Normal file
|
@ -0,0 +1,2 @@
|
||||||
|
#b/247905787
|
||||||
|
dontaudit kernel vendor_votable_debugfs:dir { search };
|
2
whitechapel/vendor/google/chre.te
vendored
2
whitechapel/vendor/google/chre.te
vendored
|
@ -24,3 +24,5 @@ allow chre hal_wifi_ext_service:service_manager find;
|
||||||
allow chre fwk_stats_service:service_manager find;
|
allow chre fwk_stats_service:service_manager find;
|
||||||
binder_call(chre, stats_service_server)
|
binder_call(chre, stats_service_server)
|
||||||
|
|
||||||
|
# Allow CHRE to block suspend, which is required to use EPOLLWAKEUP.
|
||||||
|
allow chre self:global_capability2_class_set block_suspend;
|
||||||
|
|
1
whitechapel/vendor/google/fastbootd.te
vendored
1
whitechapel/vendor/google/fastbootd.te
vendored
|
@ -5,4 +5,5 @@ allow fastbootd devinfo_block_device:blk_file rw_file_perms;
|
||||||
allow fastbootd sda_block_device:blk_file rw_file_perms;
|
allow fastbootd sda_block_device:blk_file rw_file_perms;
|
||||||
allow fastbootd sysfs_ota:file rw_file_perms;
|
allow fastbootd sysfs_ota:file rw_file_perms;
|
||||||
allow fastbootd custom_ab_block_device:blk_file rw_file_perms;
|
allow fastbootd custom_ab_block_device:blk_file rw_file_perms;
|
||||||
|
allow fastbootd citadel_device:chr_file rw_file_perms;
|
||||||
')
|
')
|
||||||
|
|
3
whitechapel/vendor/google/file.te
vendored
3
whitechapel/vendor/google/file.te
vendored
|
@ -213,6 +213,9 @@ type sysfs_trusty, sysfs_type, fs_type;
|
||||||
# BootControl
|
# BootControl
|
||||||
type sysfs_bootctl, sysfs_type, fs_type;
|
type sysfs_bootctl, sysfs_type, fs_type;
|
||||||
|
|
||||||
|
#vendor-metrics
|
||||||
|
type sysfs_vendor_metrics, fs_type, sysfs_type;
|
||||||
|
|
||||||
# Radio
|
# Radio
|
||||||
type radio_vendor_data_file, file_type, data_file_type;
|
type radio_vendor_data_file, file_type, data_file_type;
|
||||||
userdebug_or_eng(`
|
userdebug_or_eng(`
|
||||||
|
|
1
whitechapel/vendor/google/file_contexts
vendored
1
whitechapel/vendor/google/file_contexts
vendored
|
@ -108,6 +108,7 @@
|
||||||
/dev/logbuffer_pca9468_tcpm u:object_r:logbuffer_device:s0
|
/dev/logbuffer_pca9468_tcpm u:object_r:logbuffer_device:s0
|
||||||
/dev/logbuffer_pca9468 u:object_r:logbuffer_device:s0
|
/dev/logbuffer_pca9468 u:object_r:logbuffer_device:s0
|
||||||
/dev/logbuffer_cpm u:object_r:logbuffer_device:s0
|
/dev/logbuffer_cpm u:object_r:logbuffer_device:s0
|
||||||
|
/dev/logbuffer_bd u:object_r:logbuffer_device:s0
|
||||||
|
|
||||||
/dev/logbuffer_maxfg_monitor u:object_r:logbuffer_device:s0
|
/dev/logbuffer_maxfg_monitor u:object_r:logbuffer_device:s0
|
||||||
/dev/logbuffer_maxfg_base_monitor u:object_r:logbuffer_device:s0
|
/dev/logbuffer_maxfg_base_monitor u:object_r:logbuffer_device:s0
|
||||||
|
|
25
whitechapel/vendor/google/genfs_contexts
vendored
25
whitechapel/vendor/google/genfs_contexts
vendored
|
@ -355,6 +355,26 @@ genfscon sysfs /devices/platform/acpm_mfd_bus@17510000/i2c-1/1-002f/s2mpg11-mete
|
||||||
genfscon sysfs /devices/platform/acpm_mfd_bus@17510000/i2c-1/i2c-s2mpg11mfd/s2mpg11-meter/s2mpg11-odpm/iio:device0/enabled_rails u:object_r:sysfs_odpm:s0
|
genfscon sysfs /devices/platform/acpm_mfd_bus@17510000/i2c-1/i2c-s2mpg11mfd/s2mpg11-meter/s2mpg11-odpm/iio:device0/enabled_rails u:object_r:sysfs_odpm:s0
|
||||||
genfscon sysfs /devices/platform/acpm_mfd_bus@17510000/i2c-1/1-002f/s2mpg11-meter/s2mpg11-odpm/iio:device0/enabled_rails u:object_r:sysfs_odpm:s0
|
genfscon sysfs /devices/platform/acpm_mfd_bus@17510000/i2c-1/1-002f/s2mpg11-meter/s2mpg11-odpm/iio:device0/enabled_rails u:object_r:sysfs_odpm:s0
|
||||||
|
|
||||||
|
genfscon sysfs /devices/platform/acpm_mfd_bus@17500000/i2c-0/i2c-s2mpg10mfd/s2mpg10-meter/s2mpg10-odpm/wakeup u:object_r:sysfs_wakeup:s0
|
||||||
|
genfscon sysfs /devices/platform/acpm_mfd_bus@17500000/i2c-1/i2c-s2mpg10mfd/s2mpg10-meter/s2mpg10-odpm/wakeup u:object_r:sysfs_wakeup:s0
|
||||||
|
genfscon sysfs /devices/platform/acpm_mfd_bus@17500000/i2c-2/i2c-s2mpg10mfd/s2mpg10-meter/s2mpg10-odpm/wakeup u:object_r:sysfs_wakeup:s0
|
||||||
|
genfscon sysfs /devices/platform/acpm_mfd_bus@17500000/i2c-3/i2c-s2mpg10mfd/s2mpg10-meter/s2mpg10-odpm/wakeup u:object_r:sysfs_wakeup:s0
|
||||||
|
genfscon sysfs /devices/platform/acpm_mfd_bus@17500000/i2c-4/i2c-s2mpg10mfd/s2mpg10-meter/s2mpg10-odpm/wakeup u:object_r:sysfs_wakeup:s0
|
||||||
|
genfscon sysfs /devices/platform/acpm_mfd_bus@17500000/i2c-5/i2c-s2mpg10mfd/s2mpg10-meter/s2mpg10-odpm/wakeup u:object_r:sysfs_wakeup:s0
|
||||||
|
genfscon sysfs /devices/platform/acpm_mfd_bus@17500000/i2c-6/i2c-s2mpg10mfd/s2mpg10-meter/s2mpg10-odpm/wakeup u:object_r:sysfs_wakeup:s0
|
||||||
|
genfscon sysfs /devices/platform/acpm_mfd_bus@17500000/i2c-7/i2c-s2mpg10mfd/s2mpg10-meter/s2mpg10-odpm/wakeup u:object_r:sysfs_wakeup:s0
|
||||||
|
genfscon sysfs /devices/platform/acpm_mfd_bus@17500000/i2c-8/i2c-s2mpg10mfd/s2mpg10-meter/s2mpg10-odpm/wakeup u:object_r:sysfs_wakeup:s0
|
||||||
|
|
||||||
|
genfscon sysfs /devices/platform/acpm_mfd_bus@17510000/i2c-0/i2c-s2mpg11mfd/s2mpg11-meter/s2mpg11-odpm/wakeup u:object_r:sysfs_wakeup:s0
|
||||||
|
genfscon sysfs /devices/platform/acpm_mfd_bus@17510000/i2c-1/i2c-s2mpg11mfd/s2mpg11-meter/s2mpg11-odpm/wakeup u:object_r:sysfs_wakeup:s0
|
||||||
|
genfscon sysfs /devices/platform/acpm_mfd_bus@17510000/i2c-2/i2c-s2mpg11mfd/s2mpg11-meter/s2mpg11-odpm/wakeup u:object_r:sysfs_wakeup:s0
|
||||||
|
genfscon sysfs /devices/platform/acpm_mfd_bus@17510000/i2c-3/i2c-s2mpg11mfd/s2mpg11-meter/s2mpg11-odpm/wakeup u:object_r:sysfs_wakeup:s0
|
||||||
|
genfscon sysfs /devices/platform/acpm_mfd_bus@17510000/i2c-4/i2c-s2mpg11mfd/s2mpg11-meter/s2mpg11-odpm/wakeup u:object_r:sysfs_wakeup:s0
|
||||||
|
genfscon sysfs /devices/platform/acpm_mfd_bus@17510000/i2c-5/i2c-s2mpg11mfd/s2mpg11-meter/s2mpg11-odpm/wakeup u:object_r:sysfs_wakeup:s0
|
||||||
|
genfscon sysfs /devices/platform/acpm_mfd_bus@17510000/i2c-6/i2c-s2mpg11mfd/s2mpg11-meter/s2mpg11-odpm/wakeup u:object_r:sysfs_wakeup:s0
|
||||||
|
genfscon sysfs /devices/platform/acpm_mfd_bus@17510000/i2c-7/i2c-s2mpg11mfd/s2mpg11-meter/s2mpg11-odpm/wakeup u:object_r:sysfs_wakeup:s0
|
||||||
|
genfscon sysfs /devices/platform/acpm_mfd_bus@17510000/i2c-8/i2c-s2mpg11mfd/s2mpg11-meter/s2mpg11-odpm/wakeup u:object_r:sysfs_wakeup:s0
|
||||||
|
|
||||||
# bcl sysfs files
|
# bcl sysfs files
|
||||||
genfscon sysfs /devices/virtual/pmic/mitigation u:object_r:sysfs_bcl:s0
|
genfscon sysfs /devices/virtual/pmic/mitigation u:object_r:sysfs_bcl:s0
|
||||||
genfscon sysfs /devices/virtual/pmic/mitigation/clock_ratio/tpu_heavy_clk_ratio u:object_r:sysfs_bcl:s0
|
genfscon sysfs /devices/virtual/pmic/mitigation/clock_ratio/tpu_heavy_clk_ratio u:object_r:sysfs_bcl:s0
|
||||||
|
@ -526,6 +546,11 @@ genfscon sysfs /devices/platform/100b0000.G3D u:obje
|
||||||
genfscon sysfs /devices/platform/100b0000.ISP u:object_r:sysfs_thermal:s0
|
genfscon sysfs /devices/platform/100b0000.ISP u:object_r:sysfs_thermal:s0
|
||||||
genfscon sysfs /devices/platform/100b0000.TPU u:object_r:sysfs_thermal:s0
|
genfscon sysfs /devices/platform/100b0000.TPU u:object_r:sysfs_thermal:s0
|
||||||
|
|
||||||
|
#vendor-metrics
|
||||||
|
genfscon sysfs /kernel/metrics/temp_residency/temp_residency_all/stats u:object_r:sysfs_vendor_metrics:s0
|
||||||
|
genfscon sysfs /kernel/metrics/resume_latency/resume_latency_metrics u:object_r:sysfs_vendor_metrics:s0
|
||||||
|
genfscon sysfs /kernel/metrics/irq/long_irq_metrics u:object_r:sysfs_vendor_metrics:s0
|
||||||
|
|
||||||
# Trusty
|
# Trusty
|
||||||
genfscon sysfs /module/trusty_virtio/parameters/use_high_wq u:object_r:sysfs_trusty:s0
|
genfscon sysfs /module/trusty_virtio/parameters/use_high_wq u:object_r:sysfs_trusty:s0
|
||||||
genfscon sysfs /module/trusty_core/parameters/use_high_wq u:object_r:sysfs_trusty:s0
|
genfscon sysfs /module/trusty_core/parameters/use_high_wq u:object_r:sysfs_trusty:s0
|
||||||
|
|
|
@ -143,6 +143,9 @@ userdebug_or_eng(`
|
||||||
allow hal_dumpstate_default vendor_maxfg_debugfs:dir search;
|
allow hal_dumpstate_default vendor_maxfg_debugfs:dir search;
|
||||||
allow hal_dumpstate_default vendor_maxfg_debugfs:file r_file_perms;
|
allow hal_dumpstate_default vendor_maxfg_debugfs:file r_file_perms;
|
||||||
|
|
||||||
|
allow hal_dumpstate_default sysfs_vendor_metrics:dir search;
|
||||||
|
allow hal_dumpstate_default sysfs_vendor_metrics:file r_file_perms;
|
||||||
|
|
||||||
allow hal_dumpstate_default vendor_charger_debugfs:dir r_dir_perms;
|
allow hal_dumpstate_default vendor_charger_debugfs:dir r_dir_perms;
|
||||||
allow hal_dumpstate_default vendor_charger_debugfs:file r_file_perms;
|
allow hal_dumpstate_default vendor_charger_debugfs:file r_file_perms;
|
||||||
|
|
||||||
|
@ -173,6 +176,9 @@ dontaudit hal_dumpstate_default vendor_page_pinner_debugfs:file r_file_perms;
|
||||||
dontaudit hal_dumpstate_default sysfs_pixel_stat:dir r_dir_perms;
|
dontaudit hal_dumpstate_default sysfs_pixel_stat:dir r_dir_perms;
|
||||||
dontaudit hal_dumpstate_default sysfs_pixel_stat:file r_file_perms;
|
dontaudit hal_dumpstate_default sysfs_pixel_stat:file r_file_perms;
|
||||||
|
|
||||||
|
dontaudit hal_dumpstate_default sysfs_vendor_metrics:dir search;
|
||||||
|
dontaudit hal_dumpstate_default sysfs_vendor_metrics:file r_file_perms;
|
||||||
|
|
||||||
dontaudit hal_dumpstate_default vendor_dri_debugfs:file r_file_perms;
|
dontaudit hal_dumpstate_default vendor_dri_debugfs:file r_file_perms;
|
||||||
dontaudit hal_dumpstate_default vendor_dri_debugfs:dir search;
|
dontaudit hal_dumpstate_default vendor_dri_debugfs:dir search;
|
||||||
|
|
||||||
|
|
2
whitechapel/vendor/google/hal_input_processor_default.te
vendored
Normal file
2
whitechapel/vendor/google/hal_input_processor_default.te
vendored
Normal file
|
@ -0,0 +1,2 @@
|
||||||
|
# allow InputProcessor HAL to read the display resolution system property
|
||||||
|
get_prop(hal_input_processor_default, vendor_display_prop)
|
3
whitechapel/vendor/google/modem_svc_sit.te
vendored
3
whitechapel/vendor/google/modem_svc_sit.te
vendored
|
@ -30,3 +30,6 @@ get_prop(modem_svc_sit, hwservicemanager_prop)
|
||||||
|
|
||||||
# logging property
|
# logging property
|
||||||
get_prop(modem_svc_sit, vendor_logger_prop)
|
get_prop(modem_svc_sit, vendor_logger_prop)
|
||||||
|
|
||||||
|
# Modem property
|
||||||
|
set_prop(modem_svc_sit, vendor_modem_prop)
|
||||||
|
|
|
@ -26,6 +26,9 @@ allow pixelstats_vendor fwk_sensor_service:service_manager find;
|
||||||
# Batery history
|
# Batery history
|
||||||
allow pixelstats_vendor battery_history_device:chr_file r_file_perms;
|
allow pixelstats_vendor battery_history_device:chr_file r_file_perms;
|
||||||
|
|
||||||
|
#vendor-metrics
|
||||||
|
r_dir_file(pixelstats_vendor, sysfs_vendor_metrics)
|
||||||
|
|
||||||
# BCL
|
# BCL
|
||||||
allow pixelstats_vendor sysfs_bcl:dir search;
|
allow pixelstats_vendor sysfs_bcl:dir search;
|
||||||
allow pixelstats_vendor sysfs_bcl:file r_file_perms;
|
allow pixelstats_vendor sysfs_bcl:file r_file_perms;
|
||||||
|
|
1
whitechapel/vendor/google/property_contexts
vendored
1
whitechapel/vendor/google/property_contexts
vendored
|
@ -67,6 +67,7 @@ vendor.audiodump.cca.config u:object_r:vendor_audio_prop:s0
|
||||||
|
|
||||||
# for display
|
# for display
|
||||||
ro.vendor.hwc.drm.device u:object_r:vendor_display_prop:s0
|
ro.vendor.hwc.drm.device u:object_r:vendor_display_prop:s0
|
||||||
|
persist.vendor.display. u:object_r:vendor_display_prop:s0
|
||||||
|
|
||||||
# for camera
|
# for camera
|
||||||
persist.vendor.camera. u:object_r:vendor_camera_prop:s0
|
persist.vendor.camera. u:object_r:vendor_camera_prop:s0
|
||||||
|
|
3
whitechapel/vendor/google/vendor_init.te
vendored
3
whitechapel/vendor/google/vendor_init.te
vendored
|
@ -36,5 +36,8 @@ set_prop(vendor_init, vendor_battery_defender_prop)
|
||||||
# Fingerprint property
|
# Fingerprint property
|
||||||
set_prop(vendor_init, vendor_fingerprint_prop)
|
set_prop(vendor_init, vendor_fingerprint_prop)
|
||||||
|
|
||||||
|
# Display
|
||||||
|
set_prop(vendor_init, vendor_display_prop)
|
||||||
|
|
||||||
# Trusty storage FS ready
|
# Trusty storage FS ready
|
||||||
get_prop(vendor_init, vendor_trusty_storage_prop)
|
get_prop(vendor_init, vendor_trusty_storage_prop)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue