Merge Android 12 QPR1

Bug: 210511427
Merged-In: Ie31b278a639fd5a9e249ca934d543de770fb3217
Change-Id: I0daddb05e061916c60055b7df00164a76c69ebd2
This commit is contained in:
Xin Li 2021-12-13 21:37:46 -08:00
commit 0d05632eb8
13 changed files with 57 additions and 1 deletions

View file

@ -16,6 +16,7 @@ userdebug_or_eng(`
allow hal_graphics_composer_default mnt_vendor_file:dir search; allow hal_graphics_composer_default mnt_vendor_file:dir search;
allow hal_graphics_composer_default persist_file:dir search; allow hal_graphics_composer_default persist_file:dir search;
allow hal_graphics_composer_default persist_display_file:file r_file_perms; allow hal_graphics_composer_default persist_display_file:file r_file_perms;
allow hal_graphics_composer_default persist_display_file:dir search;
# allow HWC to r/w backlight # allow HWC to r/w backlight
allow hal_graphics_composer_default sysfs_leds:dir r_dir_perms; allow hal_graphics_composer_default sysfs_leds:dir r_dir_perms;

View file

@ -0,0 +1,2 @@
# allow systemui to set boot animation colors
set_prop(platform_app, bootanim_system_prop);

View file

@ -1,2 +1,8 @@
# Fingerprint (UDFPS) GHBM/LHBM toggle # Fingerprint (UDFPS) GHBM/LHBM toggle
persist.fingerprint.ghbm u:object_r:fingerprint_ghbm_prop:s0 exact bool persist.fingerprint.ghbm u:object_r:fingerprint_ghbm_prop:s0 exact bool
# Boot animation dynamic colors
persist.bootanim.color1 u:object_r:bootanim_system_prop:s0 exact int
persist.bootanim.color2 u:object_r:bootanim_system_prop:s0 exact int
persist.bootanim.color3 u:object_r:bootanim_system_prop:s0 exact int
persist.bootanim.color4 u:object_r:bootanim_system_prop:s0 exact int

View file

@ -139,6 +139,7 @@ userdebug_or_eng(`
typeattribute vendor_gps_file mlstrustedobject; typeattribute vendor_gps_file mlstrustedobject;
') ')
type sysfs_gps, sysfs_type, fs_type; type sysfs_gps, sysfs_type, fs_type;
type sysfs_gps_assert, sysfs_type, fs_type;
# Display # Display
type sysfs_display, sysfs_type, fs_type; type sysfs_display, sysfs_type, fs_type;
@ -185,6 +186,8 @@ type sysfs_video, sysfs_type, fs_type;
# UWB vendor # UWB vendor
type uwb_vendor_data_file, file_type, data_file_type, app_data_file_type; type uwb_vendor_data_file, file_type, data_file_type, app_data_file_type;
type persist_uwb_file, file_type, vendor_persist_type;
type uwb_data_vendor, file_type, data_file_type;
# PixelStats_vendor # PixelStats_vendor
type sysfs_pixelstats, fs_type, sysfs_type; type sysfs_pixelstats, fs_type, sysfs_type;

View file

@ -111,6 +111,10 @@
/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_maxfg_monitor u:object_r:logbuffer_device:s0
/dev/logbuffer_maxfg_base_monitor u:object_r:logbuffer_device:s0
/dev/logbuffer_maxfg_flip_monitor u:object_r:logbuffer_device:s0
# DM tools device # DM tools device
/dev/umts_dm0 u:object_r:radio_device:s0 /dev/umts_dm0 u:object_r:radio_device:s0
/dev/umts_router u:object_r:radio_device:s0 /dev/umts_router u:object_r:radio_device:s0
@ -349,6 +353,9 @@
# Uwb # Uwb
# R4 # R4
/vendor/bin/hw/hardware\.qorvo\.uwb-service u:object_r:hal_uwb_vendor_default_exec:s0 /vendor/bin/hw/hardware\.qorvo\.uwb-service u:object_r:hal_uwb_vendor_default_exec:s0
/vendor/bin/init\.uwb\.calib\.sh u:object_r:vendor_uwb_init_exec:s0
/mnt/vendor/persist/uwb(/.*)? u:object_r:persist_uwb_file:s0
/data/vendor/uwb(/.*)? u:object_r:uwb_data_vendor:s0
# RILD files # RILD files
/data/vendor/rild(/.*)? u:object_r:rild_vendor_data_file:s0 /data/vendor/rild(/.*)? u:object_r:rild_vendor_data_file:s0

View file

@ -14,6 +14,7 @@ genfscon sysfs /devices/platform/19000000.aoc/control/audio_wakeup u:ob
genfscon sysfs /devices/platform/19000000.aoc/control/logging_wakeup u:object_r:sysfs_aoc_dumpstate:s0 genfscon sysfs /devices/platform/19000000.aoc/control/logging_wakeup u:object_r:sysfs_aoc_dumpstate:s0
genfscon sysfs /devices/platform/19000000.aoc/control/hotword_wakeup u:object_r:sysfs_aoc_dumpstate:s0 genfscon sysfs /devices/platform/19000000.aoc/control/hotword_wakeup u:object_r:sysfs_aoc_dumpstate:s0
genfscon sysfs /devices/platform/19000000.aoc/control/memory_exception u:object_r:sysfs_aoc_dumpstate:s0 genfscon sysfs /devices/platform/19000000.aoc/control/memory_exception u:object_r:sysfs_aoc_dumpstate:s0
genfscon sysfs /devices/platform/19000000.aoc/control/memory_votes u:object_r:sysfs_aoc_dumpstate:s0
# WiFi # WiFi
genfscon sysfs /wifi u:object_r:sysfs_wifi:s0 genfscon sysfs /wifi u:object_r:sysfs_wifi:s0
@ -108,6 +109,7 @@ genfscon sysfs /devices/virtual/sec/tsp
# GPS # GPS
genfscon sysfs /devices/platform/10940000.spi/spi_master/spi5/spi5.0/nstandby u:object_r:sysfs_gps:s0 genfscon sysfs /devices/platform/10940000.spi/spi_master/spi5/spi5.0/nstandby u:object_r:sysfs_gps:s0
genfscon sysfs /devices/virtual/pps/pps0/assert_elapsed u:object_r:sysfs_gps_assert:s0
# Display # Display
genfscon sysfs /devices/platform/1c2c0000.drmdsim/1c2c0000.drmdsim.0/gamma u:object_r:sysfs_display:s0 genfscon sysfs /devices/platform/1c2c0000.drmdsim/1c2c0000.drmdsim.0/gamma u:object_r:sysfs_display:s0
@ -149,7 +151,13 @@ genfscon sysfs /devices/platform/acpm_mfd_bus@17510000/i2c-8/i2c-s2mpg11mfd/s2mp
genfscon sysfs /devices/platform/acpm_mfd_bus@17510000/i2c-8/i2c-s2mpg11mfd/s2mpg11-meter/s2mpg11-odpm/iio:device1/enabled_rails u:object_r:sysfs_odpm:s0 genfscon sysfs /devices/platform/acpm_mfd_bus@17510000/i2c-8/i2c-s2mpg11mfd/s2mpg11-meter/s2mpg11-odpm/iio:device1/enabled_rails u:object_r:sysfs_odpm: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/gpu_heavy_clk_ratio u:object_r:sysfs_bcl:s0
genfscon sysfs /devices/virtual/pmic/mitigation/clock_ratio/cpu2_heavy_clk_ratio u:object_r:sysfs_bcl:s0
genfscon sysfs /devices/virtual/pmic/mitigation/clock_ratio/cpu2_light_clk_ratio u:object_r:sysfs_bcl:s0
genfscon sysfs /devices/virtual/pmic/mitigation/clock_ratio/tpu_light_clk_ratio u:object_r:sysfs_bcl:s0
genfscon sysfs /devices/virtual/pmic/mitigation/clock_ratio/gpu_light_clk_ratio u:object_r:sysfs_bcl:s0
# Chosen # Chosen
genfscon sysfs /firmware/devicetree/base/chosen u:object_r:sysfs_chosen:s0 genfscon sysfs /firmware/devicetree/base/chosen u:object_r:sysfs_chosen:s0

View file

@ -23,3 +23,6 @@ allow gpsd hal_exynos_rild_hwservice:hwservice_manager find;
# Allow gpsd to access sensor service # Allow gpsd to access sensor service
binder_call(gpsd, system_server); binder_call(gpsd, system_server);
allow gpsd fwk_sensor_hwservice:hwservice_manager find; allow gpsd fwk_sensor_hwservice:hwservice_manager find;
# Allow gpsd to access pps gpio
allow gpsd sysfs_gps_assert:file r_file_perms;

View file

@ -7,3 +7,7 @@ set_prop(hal_nfc_default, vendor_secure_element_prop)
# Modem property # Modem property
set_prop(hal_nfc_default, vendor_modem_prop) set_prop(hal_nfc_default, vendor_modem_prop)
# Access uwb cal for SecureRanging Applet
allow hal_nfc_default uwb_data_vendor:dir r_dir_perms;
allow hal_nfc_default uwb_data_vendor:file r_file_perms;

View file

@ -12,6 +12,8 @@ allow hal_power_default thermal_link_device:dir r_dir_perms;
allow hal_power_default sysfs_thermal:dir r_dir_perms; allow hal_power_default sysfs_thermal:dir r_dir_perms;
allow hal_power_default sysfs_thermal:file rw_file_perms; allow hal_power_default sysfs_thermal:file rw_file_perms;
allow hal_power_default sysfs_thermal:lnk_file r_file_perms; allow hal_power_default sysfs_thermal:lnk_file r_file_perms;
allow hal_power_default sysfs_bcl:dir r_dir_perms;
allow hal_power_default sysfs_bcl:file rw_file_perms;
set_prop(hal_power_default, vendor_camera_prop) set_prop(hal_power_default, vendor_camera_prop)
set_prop(hal_power_default, vendor_camera_debug_prop) set_prop(hal_power_default, vendor_camera_debug_prop)
set_prop(hal_power_default, vendor_camera_fatp_prop) set_prop(hal_power_default, vendor_camera_fatp_prop)

View file

@ -6,3 +6,6 @@ add_service(hal_uwb_vendor_default, hal_uwb_vendor_service)
hal_server_domain(hal_uwb_vendor_default, hal_uwb_vendor) hal_server_domain(hal_uwb_vendor_default, hal_uwb_vendor)
binder_call(hal_uwb_vendor_default, uwb_vendor_app) binder_call(hal_uwb_vendor_default, uwb_vendor_app)
allow hal_uwb_vendor_default uwb_data_vendor:dir create_dir_perms;
allow hal_uwb_vendor_default uwb_data_vendor:file create_file_perms;

View file

@ -11,3 +11,6 @@ add_service(twoshay, touch_context_service)
# b/193224954 # b/193224954
dontaudit twoshay twoshay:capability dac_override; dontaudit twoshay twoshay:capability dac_override;
allow twoshay fwk_stats_service:service_manager find;
binder_call(twoshay, stats_service_server)

View file

@ -10,9 +10,13 @@ hal_client_domain(uwb_vendor_app, hal_uwb_vendor)
allow uwb_vendor_app app_api_service:service_manager find; allow uwb_vendor_app app_api_service:service_manager find;
allow uwb_vendor_app hal_uwb_vendor_service:service_manager find; allow uwb_vendor_app hal_uwb_vendor_service:service_manager find;
allow uwb_vendor_app nfc_service:service_manager find; allow uwb_vendor_app nfc_service:service_manager find;
allow uwb_vendor_app radio_service:service_manager find;
allow uwb_vendor_app uwb_vendor_data_file:file create_file_perms; allow uwb_vendor_app uwb_vendor_data_file:file create_file_perms;
allow uwb_vendor_app uwb_vendor_data_file:dir create_dir_perms; allow uwb_vendor_app uwb_vendor_data_file:dir create_dir_perms;
allow hal_uwb_vendor_default self:global_capability_class_set { sys_nice };
allow hal_uwb_vendor_default kernel:process { setsched };
binder_call(uwb_vendor_app, hal_uwb_vendor_default) binder_call(uwb_vendor_app, hal_uwb_vendor_default)
') ')

View file

@ -0,0 +1,10 @@
type vendor_uwb_init, domain;
type vendor_uwb_init_exec, exec_type, vendor_file_type, file_type;
init_daemon_domain(vendor_uwb_init)
allow vendor_uwb_init vendor_shell_exec:file rx_file_perms;
allow vendor_uwb_init vendor_toolbox_exec:file rx_file_perms;
allow vendor_uwb_init uwb_data_vendor:file create_file_perms;
allow vendor_uwb_init uwb_data_vendor:dir w_dir_perms;