diff options
author | Sascha Haeberling <haeberling@google.com> | 2013-11-06 14:03:17 -0800 |
---|---|---|
committer | Sascha Haeberling <haeberling@google.com> | 2013-11-06 14:03:17 -0800 |
commit | eb605b4a27be212915db5bc23e9a82b857036a1c (patch) | |
tree | 4b2d0c79d499fe6236dc8e03ea976a8817d8b78c /src/com/android/camera/SurfaceTextureRenderer.java | |
parent | 189bfea2c8fd3374aac99f4c18cda357fcf2a371 (diff) | |
download | android_packages_apps_Snap-eb605b4a27be212915db5bc23e9a82b857036a1c.tar.gz android_packages_apps_Snap-eb605b4a27be212915db5bc23e9a82b857036a1c.tar.bz2 android_packages_apps_Snap-eb605b4a27be212915db5bc23e9a82b857036a1c.zip |
Don't crash Photo Sphere on back button press in filmstrip.
Bug: 11554580
Change-Id: I983713eecbd6f13bd90f94b24a0fa1ecc26e1c56
Diffstat (limited to 'src/com/android/camera/SurfaceTextureRenderer.java')
-rw-r--r-- | src/com/android/camera/SurfaceTextureRenderer.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/camera/SurfaceTextureRenderer.java b/src/com/android/camera/SurfaceTextureRenderer.java index 66f7aa219..331504393 100644 --- a/src/com/android/camera/SurfaceTextureRenderer.java +++ b/src/com/android/camera/SurfaceTextureRenderer.java @@ -51,8 +51,10 @@ public class SurfaceTextureRenderer { @Override public void run() { synchronized (mRenderLock) { - mFrameDrawer.onDrawFrame(mGl); - mEgl.eglSwapBuffers(mEglDisplay, mEglSurface); + if (mEglDisplay != null && mEglSurface != null) { + mFrameDrawer.onDrawFrame(mGl); + mEgl.eglSwapBuffers(mEglDisplay, mEglSurface); + } mRenderLock.notifyAll(); } } |