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

Commit c2c2e26f authored by Mathieu Chartier's avatar Mathieu Chartier Committed by android-build-merger
Browse files

Merge "Call VMRuntime.clampGrowthLimit for small heap apps" automerge: 9a6c45ee automerge: 117ba186 

automerge: eb896e1f

* commit 'eb896e1f':
  Call VMRuntime.clampGrowthLimit for small heap apps
parents 4e5168fa eb896e1f

core/java/android/app/ActivityThread.java

+4 −0
Original line number Diff line number Diff line
@@ -4507,6 +4507,10 @@ public final class ActivityThread { 


        if ((data.appInfo.flags&ApplicationInfo.FLAG_LARGE_HEAP) != 0) {

            dalvik.system.VMRuntime.getRuntime().clearGrowthLimit();

        } else {

            // Small heap, clamp to the current growth limit and let the heap release

            // pages after the growth limit to the non growth limit capacity. b/18387825

            dalvik.system.VMRuntime.getRuntime().clampGrowthLimit();

        }



        // Allow disk access during application and provider setup. This could