Merge "Fix target utilization property_get." into jb-mr1-dev

captain5050 · Android (Google) Code Review · commit bfa10630c8da · 2012-10-01T17:25:55.000-07:00
diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp
@@ -574,7 +574,7 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv)
 
     strcpy(heaptargetutilizationOptsBuf, "-XX:HeapTargetUtilization=");
     property_get("dalvik.vm.heaptargetutilization", heaptargetutilizationOptsBuf+26, "");
-    if (heapmaxfreeOptsBuf[26] != '\0') {
+    if (heaptargetutilizationOptsBuf[26] != '\0') {
         opt.optionString = heaptargetutilizationOptsBuf;
         mOptions.add(opt);
     }

Original file line number	Diff line number	Diff line change
`@@ -574,7 +574,7 @@ int AndroidRuntime::startVm(JavaVM pJavaVM, JNIEnv pEnv)`
`574`	`574`
`575`	`575`	`strcpy(heaptargetutilizationOptsBuf, "-XX:HeapTargetUtilization=");`
`576`	`576`	`property_get("dalvik.vm.heaptargetutilization", heaptargetutilizationOptsBuf+26, "");`
`577`		`- if (heapmaxfreeOptsBuf[26] != '\0') {`
	`577`	`+ if (heaptargetutilizationOptsBuf[26] != '\0') {`
`578`	`578`	`opt.optionString = heaptargetutilizationOptsBuf;`
`579`	`579`	`mOptions.add(opt);`
`580`	`580`	`}`