Merge "Make surfaceRedrawNeeded forgiving" into nyc-dev

am: 28e284b * commit '28e284bd0678a7044b1d23879ef32018b1ca7384': Make surfaceRedrawNeeded forgiving Change-Id: I78dee0cdb4cb8d867c4209834226a1b7d1ab1a54
2016-04-19 14:53:30 +00:00
parent 797c4344bd 28e284bd06
commit 609bfc3966
1 changed files with 3 additions and 1 deletions
--- a/opengl/java/android/opengl/GLSurfaceView.java
+++ b/opengl/java/android/opengl/GLSurfaceView.java
@@ -547,7 +547,9 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback
     */
    @Override
    public void surfaceRedrawNeeded(SurfaceHolder holder) {
-        mGLThread.requestRenderAndWait();
+        if (mGLThread != null) {
+            mGLThread.requestRenderAndWait();
+        }
    }