am 2d3571cc: Merge "Fix the length of a profiler system property"

* commit '2d3571cc17a5a6b1072951227d889ce14a3f88cf': Fix the length of a profiler system property
2014-08-27 16:46:27 +00:00
parent 2f63f7abd3 2d3571cc17
commit d5f23f2ec0
1 changed files with 1 additions and 1 deletions
--- a/core/jni/AndroidRuntime.cpp
+++ b/core/jni/AndroidRuntime.cpp
@@ -872,7 +872,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:");