summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCalin Juravle <calin@google.com>2014-06-09 10:05:04 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-06-09 10:05:04 +0000
commit66e29d08c7a8bf5c2822505f8368eece481187ce (patch)
tree4a367c47c102ce96c51e8caa8d24a140bf9015be
parentcc62d9ad6bb84f2d5ccf8c4b64f581990bf43751 (diff)
parentee20e16d7b7d9882054855e7ce2a2dbbd6849d2d (diff)
downloadframeworks_base-66e29d08c7a8bf5c2822505f8368eece481187ce.zip
frameworks_base-66e29d08c7a8bf5c2822505f8368eece481187ce.tar.gz
frameworks_base-66e29d08c7a8bf5c2822505f8368eece481187ce.tar.bz2
am ee20e16d: am 337f97be: am 97f7f24c: Merge "Fixed comments related to profile properties."
* commit 'ee20e16d7b7d9882054855e7ce2a2dbbd6849d2d': Fixed comments related to profile properties.
-rw-r--r--core/jni/AndroidRuntime.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp
index 9383f4e..f8e6bc3 100644
--- a/core/jni/AndroidRuntime.cpp
+++ b/core/jni/AndroidRuntime.cpp
@@ -818,13 +818,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";