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

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

Browse Source 
* commit 'f1bbdf5182107aa7779cd1a91d8652f04fa1b399':
  FastJNI for android.os.Trace
This commit is contained in:
Chris Craik
2015-06-04 02:53:14 +00:00
committed by Android Git Automerger
parent 060981e439 f1bbdf5182
commit 704b3bd4a2
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/jni/android_os_Trace.cpp
View File

@@ -111,19 +111,19 @@ static JNINativeMethod gTraceMethods[] = {
"()J", "()J",
(void*)android_os_Trace_nativeGetEnabledTags }, (void*)android_os_Trace_nativeGetEnabledTags },
{ "nativeTraceCounter", { "nativeTraceCounter",
"(JLjava/lang/String;I)V", "!(JLjava/lang/String;I)V",
(void*)android_os_Trace_nativeTraceCounter }, (void*)android_os_Trace_nativeTraceCounter },
{ "nativeTraceBegin", { "nativeTraceBegin",
"(JLjava/lang/String;)V", "!(JLjava/lang/String;)V",
(void*)android_os_Trace_nativeTraceBegin }, (void*)android_os_Trace_nativeTraceBegin },
{ "nativeTraceEnd", { "nativeTraceEnd",
"(J)V", "!(J)V",
(void*)android_os_Trace_nativeTraceEnd }, (void*)android_os_Trace_nativeTraceEnd },
{ "nativeAsyncTraceBegin", { "nativeAsyncTraceBegin",
"(JLjava/lang/String;I)V", "!(JLjava/lang/String;I)V",
(void*)android_os_Trace_nativeAsyncTraceBegin }, (void*)android_os_Trace_nativeAsyncTraceBegin },
{ "nativeAsyncTraceEnd", { "nativeAsyncTraceEnd",
"(JLjava/lang/String;I)V", "!(JLjava/lang/String;I)V",
(void*)android_os_Trace_nativeAsyncTraceEnd }, (void*)android_os_Trace_nativeAsyncTraceEnd },
{ "nativeSetAppTracingAllowed", { "nativeSetAppTracingAllowed",
"(Z)V", "(Z)V",