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

Commit ea62b95e authored by Jack Palevich's avatar Jack Palevich
Browse files

Fix createSurface / eglCreateWindowSurface race. 

Previously we could have returned from createSurface on the main thread
before calling eglCreateWindowSurface on the GLThread. That could lead
to a problem because the surface could be destroyed before
eglCreateWindowSurface got a chance to run.

Bug: 8328715
Change-Id: I273149f7d4b165abbe218a91ff54083f3f498cb0
parent ab7409e6

opengl/java/android/opengl/GLSurfaceView.java

+13 −2
Original line number Diff line number Diff line
@@ -1445,6 +1445,7 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback 
                                Log.i("GLThread", "waiting tid=" + getId()

                                    + " mHaveEglContext: " + mHaveEglContext

                                    + " mHaveEglSurface: " + mHaveEglSurface

                                    + " mFinishedCreatingEglSurface: " + mFinishedCreatingEglSurface

                                    + " mPaused: " + mPaused

                                    + " mHasSurface: " + mHasSurface

                                    + " mSurfaceIsBad: " + mSurfaceIsBad
@@ -1468,8 +1469,14 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback 
                        if (LOG_SURFACE) {

                            Log.w("GLThread", "egl createSurface");

                        }

                        if (!mEglHelper.createSurface()) {

                        if (mEglHelper.createSurface()) {

                            synchronized(sGLThreadManager) {

                                mFinishedCreatingEglSurface = true;

                                sGLThreadManager.notifyAll();

                            }

                        } else {

                            synchronized(sGLThreadManager) {

                                mFinishedCreatingEglSurface = true;

                                mSurfaceIsBad = true;

                                sGLThreadManager.notifyAll();

                            }
@@ -1595,8 +1602,11 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback 
                    Log.i("GLThread", "surfaceCreated tid=" + getId());

                }

                mHasSurface = true;

                mFinishedCreatingEglSurface = false;

                sGLThreadManager.notifyAll();

                while((mWaitingForSurface) && (!mExited)) {

                while (mWaitingForSurface

                       && !mFinishedCreatingEglSurface

                       && !mExited) {

                    try {

                        sGLThreadManager.wait();

                    } catch (InterruptedException e) {
@@ -1735,6 +1745,7 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback 
        private boolean mWaitingForSurface;

        private boolean mHaveEglContext;

        private boolean mHaveEglSurface;

        private boolean mFinishedCreatingEglSurface;

        private boolean mShouldReleaseEglContext;

        private int mWidth;

        private int mHeight;