diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-01-18 18:45:21 -0800 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2011-01-19 16:13:18 -0800 |
| commit | de39851592679a545b8b6fb749507ccc7ec407f9 (patch) | |
| tree | 307f285b8f44d262a9dd1c9050b5925fb95c2765 /core/java/android/app/ActivityManager.java | |
| parent | b098f73556ae31f505782d2fe7028b83d1564147 (diff) | |
Hook up large heap API.
Change-Id: I215644f8de326fe3d4fa582447885b0aa01f72d3
Diffstat (limited to 'core/java/android/app/ActivityManager.java')
| -rw-r--r-- | core/java/android/app/ActivityManager.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java index d5aa9619962c..133a7d04003f 100644 --- a/core/java/android/app/ActivityManager.java +++ b/core/java/android/app/ActivityManager.java @@ -64,8 +64,11 @@ public class ActivityManager { static public int staticGetMemoryClass() { // Really brain dead right now -- just take this from the configured // vm heap size, and assume it is in megabytes and thus ends with "m". - String vmHeapSize = SystemProperties.get("dalvik.vm.smallheapsize", "16m"); - return Integer.parseInt(vmHeapSize.substring(0, vmHeapSize.length()-1)); + String vmHeapSize = SystemProperties.get("dalvik.vm.growthlimit", ""); + if (vmHeapSize != null && !"".equals(vmHeapSize)) { + return Integer.parseInt(vmHeapSize.substring(0, vmHeapSize.length()-1)); + } + return staticGetLargeMemoryClass(); } /** |