Merge Android 13 QPR2

Bug: 273316506
Merged-In: Id5f052116834034a9e4fd5c3adf17d3d7ef6610a
Change-Id: I8eeb4e5dc1c7257f1b4ae83b8088fb9c2b7d81c0
This commit is contained in:
Xin Li 2023-03-13 23:11:40 -07:00
commit 8086fce77e
6 changed files with 12 additions and 2 deletions

View file

@ -5,6 +5,7 @@
(typeattribute new_objects)
(typeattributeset new_objects
( new_objects
adaptive_haptics_prop
adservices_manager_service
apexd_select_prop
artd_service
@ -59,7 +60,6 @@
mdns_service
nearby_service
persist_wm_debug_prop
prng_seeder
proc_watermark_boost_factor
proc_watermark_scale_factor
prng_seeder

View file

@ -366,6 +366,7 @@ config.disable_cameraservice u:object_r:camera_config_prop:s0 exact bool
camera.disable_preview_scheduler u:object_r:camera_config_prop:s0 exact bool
camera.disable_zsl_mode u:object_r:camera_config_prop:s0 exact bool
camera.fifo.disable u:object_r:camera_config_prop:s0 exact bool
camera.enable_landscape_to_portrait u:object_r:camera_config_prop:s0 exact bool
ro.camera.notify_nfc u:object_r:camera_config_prop:s0 exact bool
ro.camera.enableLazyHal u:object_r:camera_config_prop:s0 exact bool
ro.camera.enableCamera1MaxZsl u:object_r:camera_config_prop:s0 exact bool
@ -1346,3 +1347,6 @@ ro.gms.dck.eligible_wcc u:object_r:dck_prop:s0 exact int
# virtualization service properties
virtualizationservice.state.last_cid u:object_r:virtualizationservice_prop:s0 exact uint
# Adaptive haptics settings property
vibrator.adaptive_haptics.enabled u:object_r:adaptive_haptics_prop:s0 exact string

View file

@ -34,6 +34,7 @@ allow system_app wallpaper_file:file r_file_perms;
allow system_app icon_file:file r_file_perms;
# Write to properties
set_prop(system_app, adaptive_haptics_prop)
set_prop(system_app, arm64_memtag_prop)
set_prop(system_app, bluetooth_a2dp_offload_prop)
set_prop(system_app, bluetooth_audio_hal_prop)
@ -189,3 +190,6 @@ neverallow system_app fuse_device:chr_file *;
# bug reports, but not reads.
neverallow system_app shell_data_file:dir { no_w_dir_perms open search read };
neverallow system_app shell_data_file:file { open read ioctl lock };
# system_app should be the only domain writing the adaptive haptics prop
neverallow { domain -init -system_app } adaptive_haptics_prop:property_service set;

View file

@ -333,6 +333,7 @@ dontaudit dumpstate {
mnt_vendor_file
mirror_data_file
mnt_user_file
mnt_product_file
}:dir search;
dontaudit dumpstate {
apex_mnt_dir

View file

@ -52,6 +52,7 @@ compatible_property_only(`
# Properties which can't be written outside system
system_restricted_prop(aac_drc_prop)
system_restricted_prop(adaptive_haptics_prop)
system_restricted_prop(arm64_memtag_prop)
system_restricted_prop(binder_cache_bluetooth_server_prop)
system_restricted_prop(binder_cache_system_server_prop)

View file

@ -5,6 +5,7 @@
(typeattribute new_objects)
(typeattributeset new_objects
( new_objects
adaptive_haptics_prop
adservices_manager_service
apexd_select_prop
artd_service
@ -59,7 +60,6 @@
mdns_service
nearby_service
persist_wm_debug_prop
prng_seeder
proc_watermark_boost_factor
remotelyprovisionedkeypool_service
resources_manager_service