Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 439cca14 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am f49c3ae2: am 7fd98159: Merge "Fix issue #4066157:... 

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

* commit 'f49c3ae2':
  Fix issue #4066157: ActivityManager.getMemoryClass() returning large memory class
parents 686d8370 f49c3ae2

core/java/android/app/ActivityManager.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -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));

        }

        }