Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 306022ae authored by Primiano Tucci's avatar Primiano Tucci Committed by Automerger Merge Worker
Browse files

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

Merge "Do not check for debuggable / profilable for app tracing." am: 35575305 am: c8def00f am: 8bc9d1cd am: bf4a20e4

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If3f40a46884d03589a7f602cb9126a7d2cba3105
parents b72c15b1 bf4a20e4

core/java/android/os/Trace.java

+4 −2
Original line number Diff line number Diff line
@@ -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

     */

core/jni/android_os_Trace.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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) {