summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCalin Juravle <calin@google.com>2014-06-11 17:28:29 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-06-11 17:28:29 +0000
commitb0f59cdcb4d2205faa3811277163bbf215b68dfc (patch)
tree9d4ee44e1ad5ef8c11c4aaf1ef9097b3d37e3f33
parentde1f00231f23937de41e671be987475fbdf9afc9 (diff)
parent2f84b69bf5afcf67469704e30866067b770ae786 (diff)
downloadframeworks_base-b0f59cdcb4d2205faa3811277163bbf215b68dfc.zip
frameworks_base-b0f59cdcb4d2205faa3811277163bbf215b68dfc.tar.gz
frameworks_base-b0f59cdcb4d2205faa3811277163bbf215b68dfc.tar.bz2
am 2f84b69b: Merge "Improved profile.start-immediately comment"
* commit '2f84b69bf5afcf67469704e30866067b770ae786': Improved profile.start-immediately comment
-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 5e7d6ef..987033f 100644
--- a/core/jni/AndroidRuntime.cpp
+++ b/core/jni/AndroidRuntime.cpp
@@ -820,7 +820,8 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv)
mOptions.add(opt);
}
- // Whether the profile should start upon app startup or be delayed by some random offset.
+ // Whether the profile should start upon app startup or be delayed by some random offset
+ // (in seconds) that is bound between 0 and a fixed value.
property_get("dalvik.vm.profile.start-immediately", propBuf, "0");
if (propBuf[0] == '1') {
opt.optionString = "-Xprofile-start-immediately";