Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Do not check for debuggable / profilable for app tracing." am: 355753053c am: c8def00f9f

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1587412

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I11c3344dc0a6e735040822aa52f93d13961dd1e9
This commit is contained in:
Primiano Tucci
2021-02-18 20:12:19 +00:00
committed by Automerger Merge Worker
parent e6ffa2bf1d c8def00f9f
commit 8bc9d1cd8e
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/os/Trace.java
View File

@@ -168,8 +168,10 @@ public final class Trace {
} }
/** /**
* Set whether application tracing is allowed for this process. This is intended to be set * From Android S, this is no-op.
* once at application start-up time based on whether the application is debuggable. *
* 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 * @hide
*/ */

2
core/jni/android_os_Trace.cpp
View File

@@ -83,7 +83,7 @@ static void android_os_Trace_nativeAsyncTraceEnd(JNIEnv* env, jclass,
} }
static void android_os_Trace_nativeSetAppTracingAllowed(JNIEnv*, jclass, jboolean allowed) { 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) { static void android_os_Trace_nativeSetTracingEnabled(JNIEnv*, jclass, jboolean enabled) {