diff options
| author | Elliott Hughes <enh@google.com> | 2017-02-10 19:02:51 -0800 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2017-02-13 11:29:02 -0800 |
| commit | b30769a87acc15fc7f628d8541cdf97aba22e2e2 (patch) | |
| tree | d93d47723f27c92021a558e2b71cff64fe5084a9 /libcutils/properties.cpp | |
| parent | 7e7913cb6703c7ff7e2fc31d5dafdfd25f01b899 (diff) | |
| download | system_core-b30769a87acc15fc7f628d8541cdf97aba22e2e2.tar.gz system_core-b30769a87acc15fc7f628d8541cdf97aba22e2e2.tar.bz2 system_core-b30769a87acc15fc7f628d8541cdf97aba22e2e2.zip | |
Implement android::base::WaitForProperty.
Also adapt libcutils to the bionic change that was necessary for this.
Bug: http://b/35201172
Test: ran tests
Change-Id: I72a98b70b03d23e958b46778b505fbd5c86c32ae
Diffstat (limited to 'libcutils/properties.cpp')
| -rw-r--r-- | libcutils/properties.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libcutils/properties.cpp b/libcutils/properties.cpp index 43ad5748e..d2645e640 100644 --- a/libcutils/properties.cpp +++ b/libcutils/properties.cpp @@ -129,7 +129,7 @@ struct callback_data { void* cookie; }; -static void trampoline(void* raw_data, const char* name, const char* value) { +static void trampoline(void* raw_data, const char* name, const char* value, unsigned /*serial*/) { callback_data* data = reinterpret_cast<callback_data*>(raw_data); data->callback(name, value, data->cookie); } |