drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 7fd98159: Merge "Fix issue #4066157: ActivityManager.getMemoryClass() returning large memory class" into honeycomb-mr1

Browse Source 
* commit '7fd981598ed0ec275d6da27c71e5e6c9db854e82':
  Fix issue #4066157: ActivityManager.getMemoryClass() returning large memory class
This commit is contained in:
Dianne Hackborn
2011-03-09 18:02:53 -08:00
committed by Android Git Automerger
parent abe5c07944 7fd981598e
commit f49c3ae2da
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/app/ActivityManager.java
View File

@ -74,7 +74,7 @@ public class ActivityManager {
static public int staticGetMemoryClass() { static public int staticGetMemoryClass() {
// Really brain dead right now -- just take this from the configured // 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". // 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)) { if (vmHeapSize != null && !"".equals(vmHeapSize)) {
return Integer.parseInt(vmHeapSize.substring(0, vmHeapSize.length()-1)); return Integer.parseInt(vmHeapSize.substring(0, vmHeapSize.length()-1));
} }