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

Commit 149b00e6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "libbinder: Fix initializer order error in RpcState.cpp" am: 48c47e17 am: 7f844a35 

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

Change-Id: Ibbcf3d7aac187c42c68073566041c933ab966bbe
parents 60d03b27 7f844a35

libs/binder/Android.bp

+1 −0
Original line number Original line Diff line number Diff line
@@ -166,6 +166,7 @@ cc_library { 
        "-Wextra-semi",

        "-Wextra-semi",

        "-Werror",

        "-Werror",

        "-Wzero-as-null-pointer-constant",

        "-Wzero-as-null-pointer-constant",

        "-Wreorder-init-list",

        "-DANDROID_BASE_UNIQUE_FD_DISABLE_IMPLICIT_CONVERSION",

        "-DANDROID_BASE_UNIQUE_FD_DISABLE_IMPLICIT_CONVERSION",

        "-DANDROID_UTILS_REF_BASE_DISABLE_IMPLICIT_CONSTRUCTION",

        "-DANDROID_UTILS_REF_BASE_DISABLE_IMPLICIT_CONSTRUCTION",

    ],

    ],

libs/binder/RpcState.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -125,8 +125,8 @@ status_t RpcState::onBinderLeaving(const sp<RpcSession>& session, const sp<IBind 
        auto&& [it, inserted] = mNodeForAddress.insert({RpcWireAddress::toRaw(address),

        auto&& [it, inserted] = mNodeForAddress.insert({RpcWireAddress::toRaw(address),

                                                        BinderNode{

                                                        BinderNode{

                                                                .binder = binder,

                                                                .binder = binder,

                                                                .timesSent = 1,

                                                                .sentRef = binder,

                                                                .sentRef = binder,

                                                                .timesSent = 1,

                                                        }});

                                                        }});

        if (inserted) {

        if (inserted) {

            *outAddress = it->first;

            *outAddress = it->first;