Use transaction name for binder trace

Test: manual
Change-Id: I96e0aa1180ea2f94aee155a26ae6ef4ef29d768b

1 files changed, 3 insertions, 1 deletions

diff --git a/core/java/android/os/Binder.java b/core/java/android/os/Binder.java
index f947b5ef9f5b..0a3b77168f5e 100644
--- a/core/java/android/os/Binder.java
+++ b/core/java/android/os/Binder.java
@@ -771,7 +771,9 @@ public class Binder implements IBinder {
         final boolean tracingEnabled = Binder.isTracingEnabled();
         try {
             if (tracingEnabled) {
-                Trace.traceBegin(Trace.TRACE_TAG_ALWAYS, getClass().getName() + ":" + code);
+                final String transactionName = getTransactionName(code);
+                Trace.traceBegin(Trace.TRACE_TAG_ALWAYS, getClass().getName() + ":"
+                        + (transactionName != null ? transactionName : code));
             }
             ThreadLocalWorkSourceUid.set(Binder.getCallingUid());
             res = onTransact(code, data, reply, flags);