commit 2d3571cc17a5a6b1072951227d889ce14a3f88cf
author Calin Juravle <calin@google.com> Wed Aug 27 16:36:52 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Aug 27 16:36:53 2014 +0000
tree b70721e3ea3f3c0ccc40b74d530d8985049580b8
parent 852debcc906dbf850b09e7e2fc822fe78bc735e6
parent 4d033e1c44c1b94ea5311713b8cc8bfb56bdcdd2

Merge "Fix the length of a profiler system property"

core/jni/AndroidRuntime.cpp

diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp
index f900a64..0d2cdb9 100644
--- a/core/jni/AndroidRuntime.cpp
+++ b/core/jni/AndroidRuntime.cpp
@@ -872,7 +872,7 @@
         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:");