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

* 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

View File

@@ -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",