Revert "Make system property reads wait-free"
This reverts commit 0cf90556de2bde53a1957c5946036b2fe2e4e429.
Reason for revert: Device boot failures - 144355953
Change-Id: Icd4fc8c7a1d06d688a6d37e6f1c1aa45563f711b
diff --git a/tests/system_properties_test.cpp b/tests/system_properties_test.cpp
index 6d696c7..245e42f 100644
--- a/tests/system_properties_test.cpp
+++ b/tests/system_properties_test.cpp
@@ -340,9 +340,9 @@
ASSERT_EQ(0, system_properties.Add("property", 8, "value1", 6));
const prop_info* pi = system_properties.Find("property");
ASSERT_TRUE(pi != nullptr);
- unsigned serial = __system_property_serial(pi);
+ unsigned serial = system_properties.Serial(pi);
ASSERT_EQ(0, system_properties.Update(const_cast<prop_info*>(pi), "value2", 6));
- ASSERT_NE(serial, __system_property_serial(pi));
+ ASSERT_NE(serial, system_properties.Serial(pi));
#else // __BIONIC__
GTEST_SKIP() << "bionic-only test";
#endif // __BIONIC__
@@ -389,7 +389,7 @@
prop_info* pi = const_cast<prop_info*>(system_properties.Find("property"));
ASSERT_TRUE(pi != nullptr);
- unsigned serial = __system_property_serial(pi);
+ unsigned serial = system_properties.Serial(pi);
std::thread thread([&system_properties]() {
prop_info* pi = const_cast<prop_info*>(system_properties.Find("property"));