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

Commit 1b66a8f3 authored by Steve Kondik's avatar Steve Kondik Committed by Gerrit Code Review
Browse files

Merge " opengl/java/android: Validate created surface before creating eglSurface" into gingerbread

parents e4639db2 51269bbf

opengl/java/android/opengl/GLSurfaceView.java

+7 −1
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ import android.util.AttributeSet; 
import android.util.Log;

import android.view.SurfaceHolder;

import android.view.SurfaceView;

import android.view.Surface;



/**

 * An implementation of SurfaceView that uses the dedicated surface for
@@ -1389,7 +1390,12 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback 
        }



        private boolean readyToDraw() {

            return (!mPaused) && mHasSurface

            boolean isSurfaceValid = false;

            if(mHasSurface){

                Surface sur = getHolder().getSurface();

                if(sur.isValid())isSurfaceValid = true;

            }

            return (!mPaused) && isSurfaceValid

                && (mWidth > 0) && (mHeight > 0)

                && (mRequestRender || (mRenderMode == RENDERMODE_CONTINUOUSLY));

        }