summaryrefslogtreecommitdiff
path: root/core/java/android/app/ActivityThread.java
diff options
context:
space:
mode:
authorRomain Guy <romainguy@google.com>2012-04-23 15:19:07 -0700
committerRomain Guy <romainguy@google.com>2012-04-23 15:19:07 -0700
commit19f86e831ee0629b24385b0bb51d27ff91961dd2 (patch)
tree372630e9c4509df9fadcfdb01519f940edd7ac32 /core/java/android/app/ActivityThread.java
parentb023bf85a080442117b5dae8d402bce60cd0a610 (diff)
Invoke onTrimMemory with an EGL context
Bug #6369600 Change-Id: I3ded47c3688ef2f2873495392c35e898357204da
Diffstat (limited to 'core/java/android/app/ActivityThread.java')
-rw-r--r--core/java/android/app/ActivityThread.java9
1 files changed, 6 insertions, 3 deletions
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java
index 1489b2cc791c..e2e791b1abba 100644
--- a/core/java/android/app/ActivityThread.java
+++ b/core/java/android/app/ActivityThread.java
@@ -3765,9 +3765,11 @@ public final class ActivityThread {
final void handleTrimMemory(int level) {
if (DEBUG_MEMORY_TRIM) Slog.v(TAG, "Trimming memory to level: " + level);
- WindowManagerImpl.getDefault().trimMemory(level);
- ArrayList<ComponentCallbacks2> callbacks;
+ final WindowManagerImpl windowManager = WindowManagerImpl.getDefault();
+ windowManager.startTrimMemory(level);
+
+ ArrayList<ComponentCallbacks2> callbacks;
synchronized (mPackages) {
callbacks = collectComponentCallbacksLocked(true, null);
}
@@ -3776,7 +3778,8 @@ public final class ActivityThread {
for (int i = 0; i < N; i++) {
callbacks.get(i).onTrimMemory(level);
}
- WindowManagerImpl.getDefault().terminateEgl();
+
+ windowManager.endTrimMemory();
}
private void setupGraphicsSupport(LoadedApk info) {