Merge "ViewRoot: Check Surface validity before initializing renderer from draw()." into pi-dev

am: cef96f69d7 Change-Id: I3d7857f31bfe9bba3bde78bef67f08c7b24338c6
2018-04-23 12:43:23 -07:00
parent f17d6e3010 cef96f69d7
commit c595c5c044
1 changed files with 2 additions and 1 deletions
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -3272,7 +3272,8 @@ public final class ViewRootImpl implements ViewParent,
                // eglTerminate() for instance.
                if (mAttachInfo.mThreadedRenderer != null &&
                        !mAttachInfo.mThreadedRenderer.isEnabled() &&
-                        mAttachInfo.mThreadedRenderer.isRequested()) {
+                        mAttachInfo.mThreadedRenderer.isRequested() &&
+                        mSurface.isValid()) {

                    try {
                        mAttachInfo.mThreadedRenderer.initializeIfNeeded(