Clean up server_configurable_flags test prop
Test: m -j & manually on device
Change-Id: I3f5ddeb26ddf1bf280ef5e7b3e62b4b892b83a3c
diff --git a/private/compat/26.0/26.0.ignore.cil b/private/compat/26.0/26.0.ignore.cil
index 5d90832..3633181 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 1ce8f4d..3b7f7ff 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 2040032..aeba945 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 8d87262..80ccbdf 100644
--- a/private/property_contexts
+++ b/private/property_contexts
@@ -169,7 +169,6 @@
# 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 e36d483..8648738 100644
--- a/private/system_server.te
+++ b/private/system_server.te
@@ -582,9 +582,6 @@
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 @@
-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 bcae192..257abc6 100644
--- a/public/flags_heatlh_check.te
+++ b/public/flags_heatlh_check.te
@@ -5,9 +5,6 @@
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 91d1a11..a4893ea 100644
--- a/public/property.te
+++ b/public/property.te
@@ -30,7 +30,6 @@
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 @@
-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 9f0dab2..178f3fc 100644
--- a/public/vendor_init.te
+++ b/public/vendor_init.te
@@ -176,7 +176,6 @@
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