diff --git a/private/compat/26.0/26.0.ignore.cil b/private/compat/26.0/26.0.ignore.cil index 5d9083200646f558ca10f0ff9f134cef1fc3201d..3633181a7365541abf945609e681d141a921dfc2 100644 --- a/private/compat/26.0/26.0.ignore.cil +++ b/private/compat/26.0/26.0.ignore.cil @@ -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 diff --git a/private/compat/27.0/27.0.ignore.cil b/private/compat/27.0/27.0.ignore.cil index 1ce8f4d7a9daea5c0a469c9065fd808e55f305a5..3b7f7ff2c176b26c0012ca4fe0820d88445b4e38 100644 --- a/private/compat/27.0/27.0.ignore.cil +++ b/private/compat/27.0/27.0.ignore.cil @@ -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 diff --git a/private/compat/28.0/28.0.ignore.cil b/private/compat/28.0/28.0.ignore.cil index 2040032bf57e0bd6c185355c29c55e842701af09..aeba94514472e110d1df14c82710a469ab149f1c 100644 --- a/private/compat/28.0/28.0.ignore.cil +++ b/private/compat/28.0/28.0.ignore.cil @@ -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 diff --git a/private/property_contexts b/private/property_contexts index 8d8726201313e9d212c2e42317684a8f6529c843..80ccbdf81c7a8fb4dd4e7daa9b1bde6fcfcb7964 100644 --- a/private/property_contexts +++ b/private/property_contexts @@ -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 diff --git a/private/system_server.te b/private/system_server.te index e36d483e081ca010c464ba73b56617a7c8fd8fc0..864873800606b438e15f84fd03c71ba9af1af7be 100644 --- a/private/system_server.te +++ b/private/system_server.te @@ -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; diff --git a/public/flags_heatlh_check.te b/public/flags_heatlh_check.te index bcae192e0a5e348bf4f9f390ab1430a2d316675d..257abc6a2bf25efacd7c8ae775e36fb4c9fd3432 100644 --- a/public/flags_heatlh_check.te +++ b/public/flags_heatlh_check.te @@ -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; diff --git a/public/property.te b/public/property.te index 91d1a113f15a6f8c95b8e8af819fa45719df61af..a4893ea2f9d54783dc1b74d2ced4a7be96945241 100644 --- a/public/property.te +++ b/public/property.te @@ -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 diff --git a/public/vendor_init.te b/public/vendor_init.te index 9f0dab238475d8b288c54f569da467c3345c1b43..178f3fcd03443378f11f072740a6124a3f122c60 100644 --- a/public/vendor_init.te +++ b/public/vendor_init.te @@ -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