From f287f6900c7212596f626a6fefbd2f16a7698882 Mon Sep 17 00:00:00 2001 From: Florian Mayer Date: Fri, 12 Feb 2021 16:50:14 +0000 Subject: [PATCH] Do not check for debuggable / profilable for app tracing. This is publicly undocumented and surprising behaviour. Bug: 179883548 Change-Id: Iceee54c63dc9f5d61e9dcc76a47e11cc4088ed19 --- core/java/android/os/Trace.java | 6 ++++-- core/jni/android_os_Trace.cpp | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/core/java/android/os/Trace.java b/core/java/android/os/Trace.java index 9c9e4995d6732..c8cbc517b2264 100644 --- a/core/java/android/os/Trace.java +++ b/core/java/android/os/Trace.java @@ -168,8 +168,10 @@ public final class Trace { } /** - * Set whether application tracing is allowed for this process. This is intended to be set - * once at application start-up time based on whether the application is debuggable. + * From Android S, this is no-op. + * + * Before, set whether application tracing is allowed for this process. This is intended to be + * set once at application start-up time based on whether the application is debuggable. * * @hide */ diff --git a/core/jni/android_os_Trace.cpp b/core/jni/android_os_Trace.cpp index 0f7611a8ead11..f67007cda209b 100644 --- a/core/jni/android_os_Trace.cpp +++ b/core/jni/android_os_Trace.cpp @@ -83,7 +83,7 @@ static void android_os_Trace_nativeAsyncTraceEnd(JNIEnv* env, jclass, } static void android_os_Trace_nativeSetAppTracingAllowed(JNIEnv*, jclass, jboolean allowed) { - atrace_set_debuggable(allowed); + atrace_update_tags(); } static void android_os_Trace_nativeSetTracingEnabled(JNIEnv*, jclass, jboolean enabled) {