diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-12-07 18:18:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-12-07 18:18:29 +0000 |
| commit | b894c3edda3b265273eedb98fbf1127a3e4c4888 (patch) | |
| tree | 64bef89b1a1e27871413a4ce9b7d9a63e3ef9b2a | |
| parent | 2ab80ddd6a68db7fd0900730bc866f168736ddfc (diff) | |
| parent | e9c93a714a5fcf2206a7904cb2c64f924ab53905 (diff) | |
| download | native-b894c3edda3b265273eedb98fbf1127a3e4c4888.tar.gz | |
Merge "Fix Binder warnings after C++ bump to 20" into main
| -rw-r--r-- | libs/binder/ndk/include_platform/android/binder_stability.h | 12 | ||||
| -rw-r--r-- | libs/binder/tests/binderRpcTestCommon.h | 2 |
2 files changed, 6 insertions, 8 deletions
diff --git a/libs/binder/ndk/include_platform/android/binder_stability.h b/libs/binder/ndk/include_platform/android/binder_stability.h index c1f62e58e9..089c775eca 100644 --- a/libs/binder/ndk/include_platform/android/binder_stability.h +++ b/libs/binder/ndk/include_platform/android/binder_stability.h @@ -21,17 +21,15 @@ __BEGIN_DECLS /** - * Private addition to binder_flag_t. + * Indicates that this transaction is coupled w/ vendor.img */ -enum { - /** - * Indicates that this transaction is coupled w/ vendor.img - */ - FLAG_PRIVATE_VENDOR = 0x10000000, -}; +constexpr binder_flags_t FLAG_PRIVATE_VENDOR = 0x10000000; #if defined(__ANDROID_VENDOR__) +/** + * Private addition to binder_flag_t. + */ enum { FLAG_PRIVATE_LOCAL = FLAG_PRIVATE_VENDOR, }; diff --git a/libs/binder/tests/binderRpcTestCommon.h b/libs/binder/tests/binderRpcTestCommon.h index a55edd273e..62fe9e56f6 100644 --- a/libs/binder/tests/binderRpcTestCommon.h +++ b/libs/binder/tests/binderRpcTestCommon.h @@ -393,7 +393,7 @@ public: } if (delayed) { - RpcMaybeThread([=]() { + RpcMaybeThread([=, this]() { ALOGE("Executing delayed callback: '%s'", value.c_str()); Status status = doCallback(callback, oneway, false, value); ALOGE("Delayed callback status: '%s'", status.toString8().c_str()); |