diff options
| author | 2023-12-07 19:37:03 +0000 | |
|---|---|---|
| committer | 2023-12-07 19:37:03 +0000 | |
| commit | 951cfbaa567e2f764ac35acf878f7725d052bc4f (patch) | |
| tree | 8ddeb3ecf5413198b59cb8157725d0042bcddb4e /libs | |
| parent | 7a04f377c43526036258c200f27199c3c6ebbd76 (diff) | |
| parent | a6921b999d5d3afe07a5c2d51459d7a2cebb700f (diff) | |
Merge "Fix Binder warnings after C++ bump to 20" into main am: b894c3edda am: 9ba71ca64e am: a6921b999d
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2853597
Change-Id: Ia13d32aa876209f24dfc0d26e30d6909770675d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs')
| -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()); |