Merge "Clean up server_configurable_flags test prop"

This commit is contained in:
Hongyi Zhang 2019-01-22 18:27:29 +00:00 committed by Gerrit Code Review
commit d71144a922
8 changed files with 0 additions and 14 deletions

View file

@ -39,7 +39,6 @@
ctl_sigstop_prop
device_config_boot_count_prop
device_config_reset_performed_prop
device_config_flags_health_check_prop
device_config_netd_native_prop
e2fs
e2fs_exec

View file

@ -37,7 +37,6 @@
ctl_sigstop_prop
device_config_boot_count_prop
device_config_reset_performed_prop
device_config_flags_health_check_prop
device_config_netd_native_prop
exfat
exported2_config_prop

View file

@ -26,7 +26,6 @@
cpu_variant_prop
dev_cpu_variant
device_config_boot_count_prop
device_config_flags_health_check_prop
device_config_netd_native_prop
device_config_reset_performed_prop
device_config_service

View file

@ -169,7 +169,6 @@ persist.time. u:object_r:time_prop:s0
# Properties that relate to server configurable flags
device_config.reset_performed u:object_r:device_config_reset_performed_prop:s0
persist.device_config.attempted_boot_count u:object_r:device_config_boot_count_prop:s0
persist.device_config.global_settings.native_flags_health_check_enabled u:object_r:device_config_flags_health_check_prop:s0
persist.device_config.netd_native. u:object_r:device_config_netd_native_prop:s0
apexd. u:object_r:apexd_prop:s0

View file

@ -582,9 +582,6 @@ set_prop(system_server, ctl_bugreport_prop)
set_prop(system_server, cppreopt_prop)
# server configurable flags properties
# STOPSHIP: Remove the ability for system_server to set property
# device_config_flags_health_check_prop before release. (b/119627143)
set_prop(system_server, device_config_flags_health_check_prop)
set_prop(system_server, device_config_netd_native_prop)
# BootReceiver to read ro.boot.bootreason
@ -938,7 +935,6 @@ neverallow {
-system_server
-flags_health_check
} {
device_config_flags_health_check_prop
device_config_netd_native_prop
}:property_service set;

View file

@ -5,9 +5,6 @@ type flags_health_check_exec, system_file_type, exec_type, file_type;
set_prop(flags_health_check, device_config_boot_count_prop)
set_prop(flags_health_check, device_config_reset_performed_prop)
# STOPSHIP: Remove the ability for flags_health_check to set property
# device_config_flags_health_check_prop before release. (b/119627143)
set_prop(flags_health_check, device_config_flags_health_check_prop)
set_prop(flags_health_check, device_config_netd_native_prop)
allow flags_health_check server_configurable_flags_data_file:dir rw_dir_perms;

View file

@ -30,7 +30,6 @@ type debug_prop, property_type, core_property_type;
type default_prop, property_type, core_property_type;
type device_config_boot_count_prop, property_type;
type device_config_reset_performed_prop, property_type;
type device_config_flags_health_check_prop, property_type;
type device_config_netd_native_prop, property_type;
type device_logging_prop, property_type;
type dhcp_prop, property_type, core_property_type;
@ -401,7 +400,6 @@ compatible_property_only(`
-firstboot_prop
-device_config_reset_performed_prop
-device_config_boot_count_prop
-device_config_flags_health_check_prop
-device_config_netd_native_prop
-heapprofd_enabled_prop
-heapprofd_prop

View file

@ -176,7 +176,6 @@ not_compatible_property(`
property_type
-device_config_boot_count_prop
-device_config_reset_performed_prop
-device_config_flags_health_check_prop
-device_config_netd_native_prop
-restorecon_prop
-netd_stable_secret_prop