commit 4f0c58012138beaa57bc6a68e634401a10e73f94
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jun 30 17:50:44 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jun 30 17:50:44 2022 +0000
tree f071090554271ae3f9fb6f72a269392307386e5b
parent a335edca21ff454396f4e4ccf2966deb4d7ae602
parent 3c64f60acc17647319f8dbc88efb5355d5f15430

Merge "libbinder: Prettier initializer for bitset field" am: 0d68c19a29 am: 70604273a5 am: 3c64f60acc

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2140908

Change-Id: Iff2e0d38efd528ac0bc8404b5bda8b2e7c8448b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

libs/binder/include/binder/RpcServer.h

diff --git a/libs/binder/include/binder/RpcServer.h b/libs/binder/include/binder/RpcServer.h
index a5bb871..7fea76e 100644
--- a/libs/binder/include/binder/RpcServer.h
+++ b/libs/binder/include/binder/RpcServer.h
@@ -203,8 +203,8 @@
     size_t mMaxThreads = 1;
     std::optional<uint32_t> mProtocolVersion;
     // A mode is supported if the N'th bit is on, where N is the mode enum's value.
-    std::bitset<8> mSupportedFileDescriptorTransportModes =
-            (1 << static_cast<unsigned long>(RpcSession::FileDescriptorTransportMode::NONE));
+    std::bitset<8> mSupportedFileDescriptorTransportModes = std::bitset<8>().set(
+            static_cast<size_t>(RpcSession::FileDescriptorTransportMode::NONE));
     base::unique_fd mServer; // socket we are accepting sessions on
 
     std::mutex mLock; // for below