Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Call VMRuntime.clampGrowthLimit for small heap apps"

Browse Source 
automerge: 9a6c45e

* commit '9a6c45eedd112313e5b24111f23bc309a3dc5df6':
  Call VMRuntime.clampGrowthLimit for small heap apps
This commit is contained in:
Mathieu Chartier
2015-01-09 00:20:53 +00:00
committed by android-build-merger
parent c04a21a0ef 9a6c45eedd
commit 117ba186d1
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/app/ActivityThread.java
View File

@@ -4481,6 +4481,10 @@ public final class ActivityThread {
if ((data.appInfo.flags&ApplicationInfo.FLAG_LARGE_HEAP) != 0) { if ((data.appInfo.flags&ApplicationInfo.FLAG_LARGE_HEAP) != 0) {
dalvik.system.VMRuntime.getRuntime().clearGrowthLimit(); 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 // Allow disk access during application and provider setup. This could