Make sure egl context is valid for the onTrimMemory call

It turns out that terminateHardwareResources can call into destroySurface
to make the current context 0, like in Gmail.

bug:6079959
Change-Id: I07b2f3e91d6276b6c8e1b48f72bc87d28337fe2f

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;
                     }