diff options
| author | Primiano Tucci <primiano@google.com> | 2021-02-18 17:52:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-02-18 17:52:31 +0000 |
| commit | 355753053cf8c6c573a4640d6c1047180e7494f9 (patch) | |
| tree | 739a4f195ccd7fb898bc4b141146cda79bdd4eb0 | |
| parent | 494aad3c8d6419090a5a8bb97ea41da4e33898a2 (diff) | |
| parent | f287f6900c7212596f626a6fefbd2f16a7698882 (diff) | |
| download | base-355753053cf8c6c573a4640d6c1047180e7494f9.tar.gz | |
Merge "Do not check for debuggable / profilable for app tracing."android-s-preview-1
| -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) { |