diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2015-01-09 00:40:23 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-01-09 00:40:23 +0000 |
| commit | c2c2e26fd40e85ce5a1ab7296f727fb9bbfbdd40 (patch) | |
| tree | c09b5b718550db8dffb8a33b0bc1cb8e67373ad9 /core/java/android/app | |
| parent | 4e5168fae43e783a35c5bc731e500196005268fb (diff) | |
| parent | eb896e1febd57eba541b8760bcd7010457598b85 (diff) | |
| download | frameworks_base-c2c2e26fd40e85ce5a1ab7296f727fb9bbfbdd40.zip frameworks_base-c2c2e26fd40e85ce5a1ab7296f727fb9bbfbdd40.tar.gz frameworks_base-c2c2e26fd40e85ce5a1ab7296f727fb9bbfbdd40.tar.bz2 | |
Merge "Call VMRuntime.clampGrowthLimit for small heap apps" automerge: 9a6c45e automerge: 117ba18
automerge: eb896e1
* commit 'eb896e1febd57eba541b8760bcd7010457598b85':
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 a5cdcfd..404876f 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -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 |