diff options
author | Jamie Gennis <jgennis@google.com> | 2013-04-16 16:59:07 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-16 16:59:07 -0700 |
commit | a0b28ca74806dcf46300d82ebb689b002bd36955 (patch) | |
tree | ffd18104f95fb064caf35d84640a11351f02d544 /cmds | |
parent | fa681f12ec645eaf2831e75abdd32c9987d6afa0 (diff) | |
parent | 95a869f91bb9ab24300cec37037b0edcfa54f334 (diff) | |
download | frameworks_base-a0b28ca74806dcf46300d82ebb689b002bd36955.zip frameworks_base-a0b28ca74806dcf46300d82ebb689b002bd36955.tar.gz frameworks_base-a0b28ca74806dcf46300d82ebb689b002bd36955.tar.bz2 |
am 95a869f9: Merge "Disable tracing from Zygote" into jb-mr2-dev
* commit '95a869f91bb9ab24300cec37037b0edcfa54f334':
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(); |