Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ec418d3e authored by Teng-Hui Zhu's avatar Teng-Hui Zhu Committed by Android (Google) Code Review
Browse files

Merge "Make sure egl context is valid for the onTrimMemory call"

parents 0bf89b30 4a00ab25

core/java/android/view/WindowManagerImpl.java

+2 −2
Original line number Diff line number Diff line
@@ -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;

                    }