diff options
| author | 2021-02-18 20:12:19 +0000 | |
|---|---|---|
| committer | 2021-02-18 20:12:19 +0000 | |
| commit | 8bc9d1cd8e46bc7f29313943a8266c4a8e6b46e0 (patch) | |
| tree | 95d32c7ebf2056dae484e9f5379e25f6e8400230 | |
| parent | e6ffa2bf1d0b57b60e5e35dc2f2991dd2ef991cb (diff) | |
| parent | c8def00f9faff612e3fafc9b073b067cd8f1e79d (diff) | |
Merge "Do not check for debuggable / profilable for app tracing." am: 355753053c am: c8def00f9f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1587412
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I11c3344dc0a6e735040822aa52f93d13961dd1e9
| -rw-r--r-- | core/java/android/os/Trace.java | 6 | ||||
| -rw-r--r-- | 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 9c9e4995d673..c8cbc517b226 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 0f7611a8ead1..f67007cda209 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) { |