commit 65202242defad10eb33a3b3277af49eb238a3f33
author Romain Guy <romainguy@google.com> Mon Oct 18 10:33:17 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Oct 18 10:33:17 2010 -0700
tree a262ff51b7af168357c61673e1aa44d87909b12d
parent dd70133ceb314b2753b6b0e7d22565d56eaf9785
parent 157fa0aca55b8e4747f00d2b729e5e361dea7ddb

am 157fa0ac: am 77c011ba: Set default heap size to 5MB.

Merge commit '157fa0aca55b8e4747f00d2b729e5e361dea7ddb'

* commit '157fa0aca55b8e4747f00d2b729e5e361dea7ddb':
  Set default heap size to 5MB.

core/java/com/android/internal/os/ZygoteInit.java

diff --git a/core/java/com/android/internal/os/ZygoteInit.java b/core/java/com/android/internal/os/ZygoteInit.java
index f0f3387..1d54c61 100644
--- a/core/java/com/android/internal/os/ZygoteInit.java
+++ b/core/java/com/android/internal/os/ZygoteInit.java
@@ -567,6 +567,8 @@
 
     public static void main(String argv[]) {
         try {
+            VMRuntime.getRuntime().setMinimumHeapSize(5 * 1024 * 1024);
+
             // Start profiling the zygote initialization.
             SamplingProfilerIntegration.start();