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

Commit 70e84bd1 authored by Chris Craik's avatar Chris Craik Committed by Android Git Automerger
Browse files

am f1bbdf51: Merge "FastJNI for android.os.Trace" into mnc-dev

* commit 'f1bbdf51':
  FastJNI for android.os.Trace
parents 60db096c f1bbdf51
Loading
Loading
Loading
Loading
+5 −5
Original line number Diff line number Diff line
@@ -111,19 +111,19 @@ static JNINativeMethod gTraceMethods[] = {
            "()J",
            (void*)android_os_Trace_nativeGetEnabledTags },
    { "nativeTraceCounter",
            "(JLjava/lang/String;I)V",
            "!(JLjava/lang/String;I)V",
            (void*)android_os_Trace_nativeTraceCounter },
    { "nativeTraceBegin",
            "(JLjava/lang/String;)V",
            "!(JLjava/lang/String;)V",
            (void*)android_os_Trace_nativeTraceBegin },
    { "nativeTraceEnd",
            "(J)V",
            "!(J)V",
            (void*)android_os_Trace_nativeTraceEnd },
    { "nativeAsyncTraceBegin",
            "(JLjava/lang/String;I)V",
            "!(JLjava/lang/String;I)V",
            (void*)android_os_Trace_nativeAsyncTraceBegin },
    { "nativeAsyncTraceEnd",
            "(JLjava/lang/String;I)V",
            "!(JLjava/lang/String;I)V",
            (void*)android_os_Trace_nativeAsyncTraceEnd },
    { "nativeSetAppTracingAllowed",
            "(Z)V",