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 /cmds | |
| 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 'cmds')
| -rw-r--r-- | cmds/app_process/app_main.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/cmds/app_process/app_main.cpp b/cmds/app_process/app_main.cpp index 0668be6..90bcb0f 100644 --- a/cmds/app_process/app_main.cpp +++ b/cmds/app_process/app_main.cpp @@ -12,6 +12,7 @@ #include <utils/Log.h> #include <cutils/process_name.h> #include <cutils/memory.h> +#include <cutils/trace.h> #include <android_runtime/AndroidRuntime.h> #include <sys/personality.h> @@ -95,6 +96,9 @@ public: virtual void onZygoteInit() { + // Re-enable tracing now that we're no longer in Zygote. + atrace_set_tracing_enabled(true); + sp<ProcessState> proc = ProcessState::self(); ALOGV("App process: starting thread pool.\n"); proc->startThreadPool(); |