Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f0c5801 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "libbinder: Prettier initializer for bitset field" am: 0d68c19a am:... 

Merge "libbinder: Prettier initializer for bitset field" am: 0d68c19a am: 70604273 am: 3c64f60a

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



Change-Id: Iff2e0d38efd528ac0bc8404b5bda8b2e7c8448b0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a335edca 3c64f60a

libs/binder/include/binder/RpcServer.h

+2 −2
Original line number Diff line number Diff line
@@ -203,8 +203,8 @@ private: 
    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