diff options
| author | 2022-10-19 17:44:56 +0000 | |
|---|---|---|
| committer | 2022-10-19 17:44:56 +0000 | |
| commit | dc295d032fd2bc5d1290128dfec97f841e79200e (patch) | |
| tree | 027a78ce8721b36ea29bd78ebaa73a11e56de7ed | |
| parent | ce60b5cd74554072f6122ad8470b17c97562e92d (diff) | |
| parent | 1b71f6b3d0ba7a70f81c3e73e13b3c0c79df783c (diff) | |
Enable binder txn tracing more broadly am: 1b71f6b3d0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2254717
Change-Id: Iea5ac895155dd4296c3776e0a57bcf6e8cbb36d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/java/android/os/Binder.java | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/core/java/android/os/Binder.java b/core/java/android/os/Binder.java index 7e3af189da81..50d02afbdf06 100644 --- a/core/java/android/os/Binder.java +++ b/core/java/android/os/Binder.java @@ -1262,8 +1262,15 @@ public class Binder implements IBinder { // Log any exceptions as warnings, don't silently suppress them. // If the call was {@link IBinder#FLAG_ONEWAY} then these exceptions // disappear into the ether. - final boolean tracingEnabled = Trace.isTagEnabled(Trace.TRACE_TAG_AIDL) && - (Binder.isStackTrackingEnabled() || Binder.isTracingEnabled(callingUid)); + final boolean tagEnabled = Trace.isTagEnabled(Trace.TRACE_TAG_AIDL); + final String transactionTraceName; + if (tagEnabled) { + transactionTraceName = getTransactionTraceName(code); + } else { + transactionTraceName = null; + } + + final boolean tracingEnabled = tagEnabled && transactionTraceName != null; try { final BinderCallHeavyHitterWatcher heavyHitterWatcher = sHeavyHitterWatcher; if (heavyHitterWatcher != null) { @@ -1271,7 +1278,7 @@ public class Binder implements IBinder { heavyHitterWatcher.onTransaction(callingUid, getClass(), code); } if (tracingEnabled) { - Trace.traceBegin(Trace.TRACE_TAG_AIDL, getTransactionTraceName(code)); + Trace.traceBegin(Trace.TRACE_TAG_AIDL, transactionTraceName); } if ((flags & FLAG_COLLECT_NOTED_APP_OPS) != 0) { |