diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-03-09 18:00:10 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-03-09 18:00:10 -0800 |
| commit | 7fd981598ed0ec275d6da27c71e5e6c9db854e82 (patch) | |
| tree | f204e8754a41c609dec76602ed378e14e8b93d3f /core | |
| parent | 87e8ab372bd722c5c1a00ff5262acccee5dae5e5 (diff) | |
| parent | 7ad33c8f9e7ecd356979dbad23c6c171b4f3339d (diff) | |
| download | frameworks_base-7fd981598ed0ec275d6da27c71e5e6c9db854e82.zip frameworks_base-7fd981598ed0ec275d6da27c71e5e6c9db854e82.tar.gz frameworks_base-7fd981598ed0ec275d6da27c71e5e6c9db854e82.tar.bz2 | |
Merge "Fix issue #4066157: ActivityManager.getMemoryClass() returning large memory class" into honeycomb-mr1
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/app/ActivityManager.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java index 930c6b0..b6581e9 100644 --- a/core/java/android/app/ActivityManager.java +++ b/core/java/android/app/ActivityManager.java @@ -74,7 +74,7 @@ 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.growthlimit", ""); + String vmHeapSize = SystemProperties.get("dalvik.vm.heapgrowthlimit", ""); if (vmHeapSize != null && !"".equals(vmHeapSize)) { return Integer.parseInt(vmHeapSize.substring(0, vmHeapSize.length()-1)); } |