diff options
| author | Steven Laver <lavers@google.com> | 2019-11-14 08:37:29 -0800 |
|---|---|---|
| committer | Steven Laver <lavers@google.com> | 2019-11-14 08:37:29 -0800 |
| commit | 8f54dd5edaa4ba55451f3602e5890b6f1ab807e6 (patch) | |
| tree | 709208dd25e59100a8d3d9a7038a5c7ee1c8a50b /tests/system_properties_test.cpp | |
| parent | 19c0c9cd4892927004dac3252b67aac89e462c5c (diff) | |
| parent | cb88137aebba97024bee4fff130f131924556ee5 (diff) | |
Merge RP1A.191114.001
Change-Id: I19fb768a647d471d430af4b5c3f519d4125fdeee
Diffstat (limited to 'tests/system_properties_test.cpp')
| -rw-r--r-- | tests/system_properties_test.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/system_properties_test.cpp b/tests/system_properties_test.cpp index 245e42f7d..6d696c79f 100644 --- a/tests/system_properties_test.cpp +++ b/tests/system_properties_test.cpp @@ -340,9 +340,9 @@ TEST(properties, __system_property_serial) { 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_properties.Serial(pi); + unsigned serial = __system_property_serial(pi); ASSERT_EQ(0, system_properties.Update(const_cast<prop_info*>(pi), "value2", 6)); - ASSERT_NE(serial, system_properties.Serial(pi)); + ASSERT_NE(serial, __system_property_serial(pi)); #else // __BIONIC__ GTEST_SKIP() << "bionic-only test"; #endif // __BIONIC__ @@ -389,7 +389,7 @@ TEST(properties, __system_property_wait) { prop_info* pi = const_cast<prop_info*>(system_properties.Find("property")); ASSERT_TRUE(pi != nullptr); - unsigned serial = system_properties.Serial(pi); + unsigned serial = __system_property_serial(pi); std::thread thread([&system_properties]() { prop_info* pi = const_cast<prop_info*>(system_properties.Find("property")); |