Revert "Don't use serialized propertyinfo"
This reverts commit e149f3c1d7b6848af6a27e4089d5f0c915e1437d.
Reason for revert: This is ready to be enabled now.
Bug: 36001741
Change-Id: I418d3a498ff0712ce9a1857924c6d0039026a664
diff --git a/libc/system_properties/system_properties.cpp b/libc/system_properties/system_properties.cpp
index 93184a3..f67fc4d 100644
--- a/libc/system_properties/system_properties.cpp
+++ b/libc/system_properties/system_properties.cpp
@@ -285,11 +285,19 @@
}
contexts = nullptr;
if (is_dir(property_filename)) {
- new (&contexts_union.contexts_split) ContextsSplit();
- if (!contexts_union.contexts_split.Initialize(false)) {
- return -1;
+ if (access("/dev/__properties__/property_info", R_OK) == 0) {
+ new (&contexts_union.contexts_serialized) ContextsSerialized();
+ if (!contexts_union.contexts_serialized.Initialize(false)) {
+ return -1;
+ }
+ contexts = &contexts_union.contexts_serialized;
+ } else {
+ new (&contexts_union.contexts_split) ContextsSplit();
+ if (!contexts_union.contexts_split.Initialize(false)) {
+ return -1;
+ }
+ contexts = &contexts_union.contexts_split;
}
- contexts = &contexts_union.contexts_split;
} else {
new (&contexts_union.contexts_pre_split) ContextsPreSplit();
if (!contexts_union.contexts_pre_split.Initialize(false)) {
@@ -316,9 +324,9 @@
}
// We set this unconditionally as we want tests to continue on regardless of if this failed
// and property_service will abort on an error condition, so no harm done.
- new (&contexts_union.contexts_split) ContextsSplit;
- contexts = &contexts_union.contexts_split;
- if (!contexts_union.contexts_split.Initialize(true)) {
+ new (&contexts_union.contexts_serialized) ContextsSerialized;
+ contexts = &contexts_union.contexts_serialized;
+ if (!contexts_union.contexts_serialized.Initialize(true)) {
return -1;
}
return 0;