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

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

Merge "Bring back Binder atrace symbols" into main am: 9c6c6436 

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



Change-Id: I1f902eed55fedec4584887d5a8543b618e502bd4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a4060452 9c6c6436

libs/binder/OS_android.cpp

+15 −2
Original line number Diff line number Diff line
@@ -20,7 +20,8 @@ 
#include <cutils/trace.h>

#include <utils/misc.h>



namespace android::binder::os {

namespace android::binder {

namespace os {



uint64_t GetThreadId() {

#ifdef BINDER_RPC_SINGLE_THREADED
@@ -43,4 +44,16 @@ void trace_end(uint64_t tag) { 
    atrace_end(tag);

}



} // namespace android::binder::os
 
} // namespace os



// Legacy trace symbol. To be removed once all of downstream rebuilds.

void atrace_begin(uint64_t tag, const char* name) {

    os::trace_begin(tag, name);

}



// Legacy trace symbol. To be removed once all of downstream rebuilds.

void atrace_end(uint64_t tag) {

    os::trace_end(tag);

}



} // namespace android::binder