am d3a8c8aa: Merge "Fix the length of a profiler system property" into lmp-mr1-dev

* commit 'd3a8c8aa530e6c1a605f469df7b378f688e7905a': Fix the length of a profiler system property
2014-10-29 22:49:28 +00:00
parent 9a8351d9d7 d3a8c8aa53
commit 9917ebed86
1 changed files with 1 additions and 1 deletions
--- a/core/jni/AndroidRuntime.cpp
+++ b/core/jni/AndroidRuntime.cpp
@@ -856,7 +856,7 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv)
        parseRuntimeOption("dalvik.vm.profiler.type", profileType, "-Xprofile-type:");

        // Depth of bounded stack data
-        parseRuntimeOption("dalvik.vm.profile.max-stack-depth",
+        parseRuntimeOption("dalvik.vm.profile.stack-depth",
                           profileMaxStackDepth,
                           "-Xprofile-max-stack-depth:");