Merge "Unify binder txn trace name" am: 47050bb8b6 am: ab6871e798 am: fad52f77c2

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2282660

Change-Id: I07cd4ac1bb3521d3a49d39e9f73e112459516506
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-11-04 17:12:54 +00:00
committed by Automerger Merge Worker

View File

@@ -911,11 +911,15 @@ public class Binder implements IBinder {
final String transactionName = getTransactionName(transactionCode);
final StringBuffer buf = new StringBuffer();
// Keep trace name consistent with cpp trace name in:
// system/tools/aidl/generate_cpp.cpp
buf.append("AIDL::java::");
if (transactionName != null) {
buf.append(mSimpleDescriptor).append(":").append(transactionName);
buf.append(mSimpleDescriptor).append("::").append(transactionName);
} else {
buf.append(mSimpleDescriptor).append("#").append(transactionCode);
buf.append(mSimpleDescriptor).append("::#").append(transactionCode);
}
buf.append("::server");
transactionTraceName = buf.toString();
mTransactionTraceNames.setRelease(index, transactionTraceName);