Merge "Make sure WebView get notified before the EGL context destroyed."

2012-01-25 16:53:05 -08:00
parent 52da22f273 a34eb91a20
commit 99b46be97b
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/app/ActivityThread.java
+++ b/core/java/android/app/ActivityThread.java
@@ -3741,7 +3741,6 @@ public final class ActivityThread {
    }

    final void handleTrimMemory(int level) {
-        WindowManagerImpl.getDefault().trimMemory(level);
        ArrayList<ComponentCallbacks2> callbacks;

        synchronized (mPackages) {
@@ -3752,6 +3751,7 @@ public final class ActivityThread {
        for (int i=0; i<N; i++) {
            callbacks.get(i).onTrimMemory(level);
        }
+        WindowManagerImpl.getDefault().trimMemory(level);
    }

    private void setupGraphicsSupport(LoadedApk info) {