Merge "Re-add sys_traced prop" am: bc67b7b1b4
am: d81efb87aa
Change-Id: I7bf6bea95273ac50b6f0dbe69bc7b6de63a6eefe
This commit is contained in:
commit
323fefc9b9
6 changed files with 10 additions and 0 deletions
|
@ -44,6 +44,7 @@
|
|||
device_config_runtime_native_prop
|
||||
device_config_media_native_prop
|
||||
device_config_service
|
||||
device_config_sys_traced_prop
|
||||
dnsresolver_service
|
||||
dynamic_system_service
|
||||
face_service
|
||||
|
|
|
@ -184,6 +184,9 @@ persist.device_config.runtime_native. u:object_r:device_config_runtime_na
|
|||
persist.device_config.runtime_native_boot. u:object_r:device_config_runtime_native_boot_prop:s0
|
||||
persist.device_config.media_native. u:object_r:device_config_media_native_prop:s0
|
||||
|
||||
# Properties that relate to legacy server configurable flags
|
||||
persist.device_config.global_settings.sys_traced u:object_r:device_config_sys_traced_prop:s0
|
||||
|
||||
apexd. u:object_r:apexd_prop:s0
|
||||
persist.apexd. u:object_r:apexd_prop:s0
|
||||
|
||||
|
|
|
@ -598,6 +598,7 @@ set_prop(system_server, device_config_activity_manager_native_boot_prop)
|
|||
set_prop(system_server, device_config_runtime_native_boot_prop)
|
||||
set_prop(system_server, device_config_runtime_native_prop)
|
||||
set_prop(system_server, device_config_media_native_prop)
|
||||
set_prop(system_server, device_config_sys_traced_prop)
|
||||
|
||||
# BootReceiver to read ro.boot.bootreason
|
||||
get_prop(system_server, bootloader_boot_reason_prop)
|
||||
|
@ -962,6 +963,7 @@ neverallow {
|
|||
device_config_runtime_native_boot_prop
|
||||
device_config_runtime_native_prop
|
||||
device_config_media_native_prop
|
||||
device_config_sys_traced_prop
|
||||
}:property_service set;
|
||||
|
||||
# system_server should never be executing dex2oat. This is either
|
||||
|
|
|
@ -10,6 +10,7 @@ set_prop(flags_health_check, device_config_input_native_boot_prop)
|
|||
set_prop(flags_health_check, device_config_netd_native_prop)
|
||||
set_prop(flags_health_check, device_config_activity_manager_native_boot_prop)
|
||||
set_prop(flags_health_check, device_config_media_native_prop)
|
||||
set_prop(flags_health_check, device_config_sys_traced_prop)
|
||||
|
||||
allow flags_health_check server_configurable_flags_data_file:dir rw_dir_perms;
|
||||
allow flags_health_check server_configurable_flags_data_file:file create_file_perms;
|
||||
|
|
|
@ -38,6 +38,7 @@ type device_config_netd_native_prop, property_type;
|
|||
type device_config_runtime_native_boot_prop, property_type;
|
||||
type device_config_runtime_native_prop, property_type;
|
||||
type device_config_media_native_prop, property_type;
|
||||
type device_config_sys_traced_prop, property_type;
|
||||
type device_logging_prop, property_type;
|
||||
type dhcp_prop, property_type, core_property_type;
|
||||
type dumpstate_options_prop, property_type;
|
||||
|
@ -421,6 +422,7 @@ compatible_property_only(`
|
|||
-device_config_runtime_native_boot_prop
|
||||
-device_config_runtime_native_prop
|
||||
-device_config_media_native_prop
|
||||
-device_config_sys_traced_prop
|
||||
-gsid_prop
|
||||
-heapprofd_enabled_prop
|
||||
-heapprofd_prop
|
||||
|
|
|
@ -197,6 +197,7 @@ not_compatible_property(`
|
|||
-device_config_runtime_native_boot_prop
|
||||
-device_config_runtime_native_prop
|
||||
-device_config_media_native_prop
|
||||
-device_config_sys_traced_prop
|
||||
-restorecon_prop
|
||||
-netd_stable_secret_prop
|
||||
-firstboot_prop
|
||||
|
|
Loading…
Reference in a new issue