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

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

Merge "Fix Binder warnings after C++ bump to 20" into main am: b894c3ed am: 9ba71ca6 

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



Change-Id: I68dc07c0995c85626ff133fc20af5cb9eface92c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 34d58133 9ba71ca6

libs/binder/ndk/include_platform/android/binder_stability.h

+5 −7
Original line number Diff line number Diff line
@@ -20,18 +20,16 @@ 


__BEGIN_DECLS



/**

 * Private addition to binder_flag_t.

 */

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,

};

libs/binder/tests/binderRpcTestCommon.h

+1 −1
Original line number Diff line number Diff line
@@ -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());