diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2012-03-02 09:41:14 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-02 09:41:14 -0800 |
| commit | ec418d3eae3d10cdc1b9d71f63648ce356722a94 (patch) | |
| tree | b42aaf4c28cbed306c23636c330f69d8e023cd16 /core/java/android | |
| parent | 0bf89b3052b3c1166be6dc5918a37e154bfff067 (diff) | |
| parent | 4a00ab2563d829822cf564c9a91bdc49db405b6e (diff) | |
Merge "Make sure egl context is valid for the onTrimMemory call"
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/view/WindowManagerImpl.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/view/WindowManagerImpl.java b/core/java/android/view/WindowManagerImpl.java index f56dd107bd74..d482b3561ba6 100644 --- a/core/java/android/view/WindowManagerImpl.java +++ b/core/java/android/view/WindowManagerImpl.java @@ -437,8 +437,6 @@ public class WindowManagerImpl implements WindowManager { case ComponentCallbacks2.TRIM_MEMORY_MODERATE: // On low and medium end gfx devices if (!ActivityManager.isHighEndGfx(getDefaultDisplay())) { - // Force a full memory flush - HardwareRenderer.trimMemory(ComponentCallbacks2.TRIM_MEMORY_COMPLETE); // Destroy all hardware surfaces and resources associated to // known windows synchronized (this) { @@ -448,6 +446,8 @@ public class WindowManagerImpl implements WindowManager { mRoots[i].terminateHardwareResources(); } } + // Force a full memory flush + HardwareRenderer.trimMemory(ComponentCallbacks2.TRIM_MEMORY_COMPLETE); mNeedsEglTerminate = true; break; } |