diff options
| author | 2022-03-09 03:05:25 +0000 | |
|---|---|---|
| committer | 2022-03-09 03:05:25 +0000 | |
| commit | 48c47e1776d939a3e0dd9f0aa7c1b34608a2b46c (patch) | |
| tree | 84f7d135a437d6ba9dddefda33c77697d2fce43f | |
| parent | 674d912e57b14e8c91413624894fbfeb1f01cb54 (diff) | |
| parent | 5a036f3748016c19847e9f321865c5c655041c18 (diff) | |
Merge "libbinder: Fix initializer order error in RpcState.cpp"
| -rw-r--r-- | libs/binder/Android.bp | 1 | ||||
| -rw-r--r-- | libs/binder/RpcState.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/libs/binder/Android.bp b/libs/binder/Android.bp index 7448308ec9..63d87dae5a 100644 --- a/libs/binder/Android.bp +++ b/libs/binder/Android.bp @@ -166,6 +166,7 @@ cc_library { "-Wextra-semi", "-Werror", "-Wzero-as-null-pointer-constant", + "-Wreorder-init-list", "-DANDROID_BASE_UNIQUE_FD_DISABLE_IMPLICIT_CONVERSION", "-DANDROID_UTILS_REF_BASE_DISABLE_IMPLICIT_CONSTRUCTION", ], diff --git a/libs/binder/RpcState.cpp b/libs/binder/RpcState.cpp index 4ddbce71a8..2e7084e12e 100644 --- a/libs/binder/RpcState.cpp +++ b/libs/binder/RpcState.cpp @@ -125,8 +125,8 @@ status_t RpcState::onBinderLeaving(const sp<RpcSession>& session, const sp<IBind auto&& [it, inserted] = mNodeForAddress.insert({RpcWireAddress::toRaw(address), BinderNode{ .binder = binder, - .timesSent = 1, .sentRef = binder, + .timesSent = 1, }}); if (inserted) { *outAddress = it->first; |