Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Icf1d0a35c8d9fa7d7b7427c02969bd0d472ccb6a
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:08:41 +00:00
committed by Automerger Merge Worker
parent b84b7705c7 ab6871e798
commit fad52f77c2
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/os/Binder.java
View File

@@ -911,11 +911,15 @@ public class Binder implements IBinder {
final String transactionName = getTransactionName(transactionCode); final String transactionName = getTransactionName(transactionCode);
final StringBuffer buf = new StringBuffer(); 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) { if (transactionName != null) {
buf.append(mSimpleDescriptor).append(":").append(transactionName); buf.append(mSimpleDescriptor).append("::").append(transactionName);
} else { } else {
buf.append(mSimpleDescriptor).append("#").append(transactionCode); buf.append(mSimpleDescriptor).append("::#").append(transactionCode);
} }
buf.append("::server");
transactionTraceName = buf.toString(); transactionTraceName = buf.toString();
mTransactionTraceNames.setRelease(index, transactionTraceName); mTransactionTraceNames.setRelease(index, transactionTraceName);