commit 44abcb5e41c463f0b6f1c415a91052fe14058995
author Magnus Jedvert <magjed@webrtc.org> Wed Jul 06 14:16:09 2016
committer Magnus Jedvert <magjed@webrtc.org> Wed Jul 06 14:16:23 2016
tree 84583adb72a0234b0daa0261786e6d1bc5f6d305
parent 8513029e1f06804f99d57affc42bf945546d28c4

Android SurfaceViewRenderer: Fix eglBase null pointer exception

Add null checks for eglBase, and detach the egl context in
SurfaceViewRenderer.surfaceDestroyed().

BUG=webrtc:6032
R=sakal@webrtc.org

Review URL: https://codereview.webrtc.org/2124983002 .

Cr-Commit-Position: refs/heads/master@{#13396}

webrtc/api/android/java/src/org/webrtc/SurfaceViewRenderer.java

diff --git a/webrtc/api/android/java/src/org/webrtc/SurfaceViewRenderer.java b/webrtc/api/android/java/src/org/webrtc/SurfaceViewRenderer.java
index 4b79fe4..6c8af24 100644
--- a/webrtc/api/android/java/src/org/webrtc/SurfaceViewRenderer.java
+++ b/webrtc/api/android/java/src/org/webrtc/SurfaceViewRenderer.java
@@ -171,9 +171,10 @@
     // |renderThreadHandler| is only created after |eglBase| is created in init(), so the
     // following code will only execute if eglBase != null.
     runOnRenderThread(new Runnable() {
-      @Override public void run() {
+      @Override
+      public void run() {
         synchronized (layoutLock) {
-          if (isSurfaceCreated && !eglBase.hasSurface()) {
+          if (eglBase != null && isSurfaceCreated && !eglBase.hasSurface()) {
             eglBase.createSurface(getHolder().getSurface());
             eglBase.makeCurrent();
             // Necessary for YUV frames with odd width.
@@ -372,8 +373,12 @@
       surfaceSize.y = 0;
     }
     runOnRenderThread(new Runnable() {
-      @Override public void run() {
-        eglBase.releaseSurface();
+      @Override
+      public void run() {
+        if (eglBase != null) {
+          eglBase.detachCurrent();
+          eglBase.releaseSurface();
+        }
       }
     });
   }