diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-12-07 18:48:08 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-12-07 18:48:08 +0000 |
| commit | 9ba71ca64e872456595d133a2f87c0db85dbb2ca (patch) | |
| tree | 74c14989972217dcd6bf7280bd958bc5db8104d2 | |
| parent | e3de832b9b2b906b6907baa91a39d011635248d4 (diff) | |
| parent | b894c3edda3b265273eedb98fbf1127a3e4c4888 (diff) | |
| download | native-9ba71ca64e872456595d133a2f87c0db85dbb2ca.tar.gz | |
Merge "Fix Binder warnings after C++ bump to 20" into main am: b894c3edda
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2853597
Change-Id: I736d5fbc71b43c25939ae93b2d4c9a23cbf44900
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -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()); |