diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2015-01-09 00:17:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-01-09 00:17:16 +0000 |
| commit | 9a6c45eedd112313e5b24111f23bc309a3dc5df6 (patch) | |
| tree | e67ae6d7a324a375767c87246f56e1f1f3443d5b /core/java/android/app | |
| parent | 64044d0b7bc9aa46c60adcadce699d556e1c608e (diff) | |
| parent | 24cee07160ec19c16198300bf8e3ec46c5806c54 (diff) | |
| download | frameworks_base-9a6c45eedd112313e5b24111f23bc309a3dc5df6.zip frameworks_base-9a6c45eedd112313e5b24111f23bc309a3dc5df6.tar.gz frameworks_base-9a6c45eedd112313e5b24111f23bc309a3dc5df6.tar.bz2 | |
Merge "Call VMRuntime.clampGrowthLimit for small heap apps"
Diffstat (limited to 'core/java/android/app')
| -rw-r--r-- | core/java/android/app/ActivityThread.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index 6233676..978366e 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -4481,6 +4481,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 |