commit b30236d87a8b70a638f7846df83fc8a405c61c08
author John Reck <jreck@google.com> Thu Aug 04 07:55:38 2016 -0700
committer gitbuildkicker <android-build@google.com> Thu Aug 04 13:15:10 2016 -0700
tree d35ad171e32cfdb86eb31fc8fd9313dc235b9656
parent bc32ce6a2dd1674c41cba3043b1ad9919b544388

Fix NPE in TextureView

Bug: 30651595
Change-Id: Ic6cc2a1598de173aaadb4061562236a563a662b3

core/java/android/view/TextureView.java

diff --git a/core/java/android/view/TextureView.java b/core/java/android/view/TextureView.java
index ce2fa81..a42da85 100644
--- a/core/java/android/view/TextureView.java
+++ b/core/java/android/view/TextureView.java
@@ -242,21 +242,23 @@
     }
 
     private void releaseSurfaceTexture() {
-        boolean shouldRelease = true;
+        if (mSurface != null) {
+            boolean shouldRelease = true;
 
-        if (mListener != null) {
-            shouldRelease = mListener.onSurfaceTextureDestroyed(mSurface);
-        }
+            if (mListener != null) {
+                shouldRelease = mListener.onSurfaceTextureDestroyed(mSurface);
+            }
 
-        synchronized (mNativeWindowLock) {
-            nDestroyNativeWindow();
-        }
+            synchronized (mNativeWindowLock) {
+                nDestroyNativeWindow();
+            }
 
-        if (shouldRelease) {
-            mSurface.release();
+            if (shouldRelease) {
+                mSurface.release();
+            }
+            mSurface = null;
+            mHadSurface = true;
         }
-        mSurface = null;
-        mHadSurface = true;
     }
 
     /**