diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2012-03-01 16:04:18 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-01 16:04:18 -0800 |
| commit | b22d6c11efcb6b51315821c740b47b6deff30a12 (patch) | |
| tree | 3c88719cb73f9ac9fbd612269dd5e83fbfedf2b1 /core/java/android/app/ActivityThread.java | |
| parent | 2755e31546062a1127ab52dadb8d57b0833c3c03 (diff) | |
| parent | d9624138723c55a0ac2af58a2e78e98cd51eba27 (diff) | |
Merge "Allow webview to delete GL resource in a valid EGL context"
Diffstat (limited to 'core/java/android/app/ActivityThread.java')
| -rw-r--r-- | core/java/android/app/ActivityThread.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index 1230c81d597c..f10bf036c760 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -3751,6 +3751,7 @@ public final class ActivityThread { } final void handleTrimMemory(int level) { + WindowManagerImpl.getDefault().trimMemory(level); ArrayList<ComponentCallbacks2> callbacks; synchronized (mPackages) { @@ -3761,7 +3762,7 @@ public final class ActivityThread { for (int i=0; i<N; i++) { callbacks.get(i).onTrimMemory(level); } - WindowManagerImpl.getDefault().trimMemory(level); + WindowManagerImpl.getDefault().terminateEgl(); } private void setupGraphicsSupport(LoadedApk info) { |