diff options
| author | Calin Juravle <calin@google.com> | 2014-06-09 09:56:37 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-09 09:56:37 +0000 |
| commit | ee20e16d7b7d9882054855e7ce2a2dbbd6849d2d (patch) | |
| tree | 6ba44041737064c877fd279474001c13faadbc89 /core | |
| parent | 1f241f7e16f7b363b0f0c3a9dc8e03e333e0852b (diff) | |
| parent | 337f97bedc09354ea9a8a506aefccc39dd4248e8 (diff) | |
| download | frameworks_base-ee20e16d7b7d9882054855e7ce2a2dbbd6849d2d.zip frameworks_base-ee20e16d7b7d9882054855e7ce2a2dbbd6849d2d.tar.gz frameworks_base-ee20e16d7b7d9882054855e7ce2a2dbbd6849d2d.tar.bz2 | |
am 337f97be: am 97f7f24c: Merge "Fixed comments related to profile properties."
* commit '337f97bedc09354ea9a8a506aefccc39dd4248e8':
Fixed comments related to profile properties.
Diffstat (limited to 'core')
| -rw-r--r-- | core/jni/AndroidRuntime.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp index 1772509..5e7d6ef 100644 --- a/core/jni/AndroidRuntime.cpp +++ b/core/jni/AndroidRuntime.cpp @@ -813,13 +813,14 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv) * Set profiler options */ if (libart) { - // Number of seconds during profile runs. + // Whether or not the profiler should be enabled. property_get("dalvik.vm.profiler", propBuf, "0"); if (propBuf[0] == '1') { opt.optionString = "-Xenable-profiler"; mOptions.add(opt); } + // Whether the profile should start upon app startup or be delayed by some random offset. property_get("dalvik.vm.profile.start-immediately", propBuf, "0"); if (propBuf[0] == '1') { opt.optionString = "-Xprofile-start-immediately"; |