diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-07-23 01:08:59 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-07-23 01:08:59 +0000 |
| commit | 0c8ddab32d7f0b906baee25075498069b55dc75a (patch) | |
| tree | e6a2115e1f529fa85eb7ff9a108dda9becd0aba9 | |
| parent | a166d1c5e1d4f50ac1fec4003c9108cabd4f1251 (diff) | |
| parent | ab4c8a15b628d125ec78c77b78c1123a108331d5 (diff) | |
| download | bt-0c8ddab32d7f0b906baee25075498069b55dc75a.tar.gz | |
Snap for 7574892 from ab4c8a15b628d125ec78c77b78c1123a108331d5 to sc-d1-release
Change-Id: Ic68e813b824c613d759d494b47ca068bb0f799a8
| -rw-r--r-- | osi/src/properties.cc | 2 | ||||
| -rw-r--r-- | osi/test/properties_test.cc | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/osi/src/properties.cc b/osi/src/properties.cc index c20b39f59..4202479a1 100644 --- a/osi/src/properties.cc +++ b/osi/src/properties.cc @@ -67,4 +67,4 @@ bool osi_property_get_bool(const char* key, bool default_value) { #else return property_get_bool(key, default_value); #endif // defined(OS_GENERIC) -}
\ No newline at end of file +} diff --git a/osi/test/properties_test.cc b/osi/test/properties_test.cc index 499f6f3f3..0d4553daa 100644 --- a/osi/test/properties_test.cc +++ b/osi/test/properties_test.cc @@ -31,6 +31,7 @@ TEST_F(PropertiesTest, test_default_value) { } TEST_F(PropertiesTest, test_successfull_set_and_get_value) { +#if !defined(OS_GENERIC) char value[PROPERTY_VALUE_MAX] = "nothing_interesting"; int ret = osi_property_set("very.useful.set.test", value); ASSERT_EQ(0, ret); @@ -38,6 +39,7 @@ TEST_F(PropertiesTest, test_successfull_set_and_get_value) { char received[PROPERTY_VALUE_MAX]; osi_property_get("very.useful.set.test", received, NULL); ASSERT_STREQ(received, "nothing_interesting"); +#endif } TEST_F(PropertiesTest, test_default_value_int32) { @@ -47,10 +49,12 @@ TEST_F(PropertiesTest, test_default_value_int32) { } TEST_F(PropertiesTest, test_successfull_set_and_get_value_int32) { +#if !defined(OS_GENERIC) char value[PROPERTY_VALUE_MAX] = "42"; int ret = osi_property_set("very.useful.set.test", value); ASSERT_EQ(0, ret); int32_t received = osi_property_get_int32("very.useful.set.test", 84); ASSERT_EQ(received, 42); -}
\ No newline at end of file +#endif +} |