diff options
| author | Jamie Gennis <jgennis@google.com> | 2013-04-16 17:01:12 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-16 17:01:12 -0700 |
| commit | a720a87fded1704d1a7490956bc5ec682b67a4fb (patch) | |
| tree | 3241d94b66d95366497cc2cb745a81ce2534129a /core/jni/android_os_Trace.cpp | |
| parent | 92dc45078221cc98f0a2c0cb3f4c5a634499782d (diff) | |
| parent | a0b28ca74806dcf46300d82ebb689b002bd36955 (diff) | |
| download | frameworks_base-a720a87fded1704d1a7490956bc5ec682b67a4fb.zip frameworks_base-a720a87fded1704d1a7490956bc5ec682b67a4fb.tar.gz frameworks_base-a720a87fded1704d1a7490956bc5ec682b67a4fb.tar.bz2 | |
am a0b28ca7: am 95a869f9: Merge "Disable tracing from Zygote" into jb-mr2-dev
* commit 'a0b28ca74806dcf46300d82ebb689b002bd36955':
Disable tracing from Zygote
Diffstat (limited to 'core/jni/android_os_Trace.cpp')
| -rw-r--r-- | core/jni/android_os_Trace.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/core/jni/android_os_Trace.cpp b/core/jni/android_os_Trace.cpp index 1315291..01d02c5 100644 --- a/core/jni/android_os_Trace.cpp +++ b/core/jni/android_os_Trace.cpp @@ -86,6 +86,11 @@ static void android_os_Trace_nativeSetAppTracingAllowed(JNIEnv* env, atrace_set_debuggable(allowed); } +static void android_os_Trace_nativeSetTracingEnabled(JNIEnv* env, + jclass clazz, jboolean enabled) { + atrace_set_tracing_enabled(enabled); +} + static JNINativeMethod gTraceMethods[] = { /* name, signature, funcPtr */ { "nativeGetEnabledTags", @@ -109,6 +114,9 @@ static JNINativeMethod gTraceMethods[] = { { "nativeSetAppTracingAllowed", "(Z)V", (void*)android_os_Trace_nativeSetAppTracingAllowed }, + { "nativeSetTracingEnabled", + "(Z)V", + (void*)android_os_Trace_nativeSetTracingEnabled }, }; int register_android_os_Trace(JNIEnv* env) { |