Switch to the final flag for the March train.
Bug: 251150519
Test: Presubmit
Merged-In: I163f808399eb27393e00dbb149d5941ff3db277f
Change-Id: I53a86c6024a0bd08ae2c794041b4bb0a95b61dca
diff --git a/odrefresh/odr_config.h b/odrefresh/odr_config.h
index fab50e9..5c3f4ee 100644
--- a/odrefresh/odr_config.h
+++ b/odrefresh/odr_config.h
@@ -68,9 +68,6 @@
const android::base::NoDestructor<std::vector<SystemPropertyConfig>> kSystemProperties{
{SystemPropertyConfig{.name = "persist.device_config.runtime_native_boot.enable_uffd_gc",
.default_value = "false"},
- SystemPropertyConfig{
- .name = "persist.device_config.runtime_native_boot.enable_uffd_gc_feb2023",
- .default_value = "false"},
SystemPropertyConfig{.name = kPhDisableCompactDex, .default_value = "false"}}};
// An enumeration of the possible zygote configurations on Android.
diff --git a/runtime/gc/collector/mark_compact.cc b/runtime/gc/collector/mark_compact.cc
index e1967e3..1083428 100644
--- a/runtime/gc/collector/mark_compact.cc
+++ b/runtime/gc/collector/mark_compact.cc
@@ -138,7 +138,7 @@
}
static bool SysPropSaysUffdGc() {
- return GetBoolProperty("persist.device_config.runtime_native_boot.enable_uffd_gc_feb2023",
+ return GetBoolProperty("persist.device_config.runtime_native_boot.enable_uffd_gc",
GetBoolProperty("ro.dalvik.vm.enable_uffd_gc", false));
}