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

Commit 35575305 authored by Primiano Tucci's avatar Primiano Tucci Committed by Gerrit Code Review
Browse files

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

parents 494aad3c f287f690

core/java/android/os/Trace.java

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

     * 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

     */

     */

core/jni/android_os_Trace.cpp

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

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) {