From 762a8b305a61b65d9fc6a3bd3e8d4f5f4f6c7e4d Mon Sep 17 00:00:00 2001
From: Zim <zezeozue@google.com>
Date: Wed, 2 Nov 2022 10:33:45 +0000
Subject: [PATCH] Unify binder txn trace name

To match cpp aidl trace name for easier perfetto parsing

Test: Manual
Bug: 161393989
Change-Id: I21d788c8de27327bd3f64da2e8cf14e6fcf9d073
---
 core/java/android/os/Binder.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/core/java/android/os/Binder.java b/core/java/android/os/Binder.java
index 2f4b2c411c1d6..8f7347ea18286 100644
--- a/core/java/android/os/Binder.java
+++ b/core/java/android/os/Binder.java
@@ -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);