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

Commit c92fd01b authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "libbinder: BBinder descriptor" am: 02f87ae0 am: 0885db17 am: fd4f3bb1 

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



Change-Id: If2221b643ce2786cf72a22e96a9315b0914970c9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2fde912b fd4f3bb1

libs/binder/Binder.cpp

+3 −5
Original line number Diff line number Diff line
@@ -283,11 +283,9 @@ status_t BBinder::pingBinder() 


const String16& BBinder::getInterfaceDescriptor() const

{

    // This is a local static rather than a global static,

    // to avoid static initializer ordering issues.

    static String16 sEmptyDescriptor;

    ALOGW("reached BBinder::getInterfaceDescriptor (this=%p)", this);

    return sEmptyDescriptor;

    static StaticString16 sBBinder(u"BBinder");

    ALOGW("Reached BBinder::getInterfaceDescriptor (this=%p). Override?", this);

    return sBBinder;

}



// NOLINTNEXTLINE(google-default-arguments)