Merge "vendor_init can set config.disable_cameraservice" am: 3e93ffb62f am: a5474245a7

Change-Id: I3600e77797dcaa8f7e5eb2bf17016197d3db9a3a
This commit is contained in:
Automerger Merge Worker 2020-01-08 07:27:09 +00:00
commit 7caaf1084e
5 changed files with 15 additions and 0 deletions

View file

@ -23,6 +23,7 @@
dataloader_manager_service
device_config_storage_native_boot_prop
device_config_sys_traced_prop
exported_camera_prop
file_integrity_service
gmscore_app
hal_can_bus_hwservice

View file

@ -76,6 +76,7 @@ compatible_property_only(`
get_prop({coredomain appdomain shell}, exported3_default_prop)
get_prop({coredomain appdomain shell}, exported3_radio_prop)
get_prop({coredomain appdomain shell}, exported3_system_prop)
get_prop({coredomain appdomain shell}, exported_camera_prop)
get_prop({coredomain shell}, userspace_reboot_exported_prop)
get_prop({coredomain shell}, userspace_reboot_prop)
get_prop({domain -coredomain -appdomain}, vendor_default_prop)

View file

@ -120,6 +120,7 @@ system_public_prop(exported3_default_prop)
system_public_prop(exported3_radio_prop)
system_public_prop(exported_audio_prop)
system_public_prop(exported_bluetooth_prop)
system_public_prop(exported_camera_prop)
system_public_prop(exported_config_prop)
system_public_prop(exported_dalvik_prop)
system_public_prop(exported_default_prop)
@ -450,6 +451,16 @@ compatible_property_only(`
exported_bluetooth_prop
}:property_service set;
neverallow {
domain
-coredomain
-hal_camera_server
-cameraserver
-vendor_init
} {
exported_camera_prop
}:property_service set;
neverallow {
domain
-coredomain

View file

@ -287,6 +287,7 @@ aaudio.mixer_bursts u:object_r:exported_default_prop:s0 exact int
aaudio.mmap_exclusive_policy u:object_r:exported_default_prop:s0 exact int
aaudio.mmap_policy u:object_r:exported_default_prop:s0 exact int
aaudio.wakeup_delay_usec u:object_r:exported_default_prop:s0 exact int
config.disable_cameraservice u:object_r:exported_camera_prop:s0 exact bool
gsm.sim.operator.numeric u:object_r:exported_radio_prop:s0 exact string
media.mediadrmservice.enable u:object_r:exported_default_prop:s0 exact bool
persist.rcs.supported u:object_r:exported_default_prop:s0 exact int

View file

@ -238,6 +238,7 @@ set_prop(vendor_init, cpu_variant_prop)
set_prop(vendor_init, debug_prop)
set_prop(vendor_init, exported_audio_prop)
set_prop(vendor_init, exported_bluetooth_prop)
set_prop(vendor_init, exported_camera_prop)
set_prop(vendor_init, exported_config_prop)
set_prop(vendor_init, exported_dalvik_prop)
set_prop(vendor_init, exported_default_prop)