Fix NPE in TextureView

Bug: 30651595 Change-Id: Ic6cc2a1598de173aaadb4061562236a563a662b3
2016-08-04 07:55:38 -07:00
parent 8437fce56d
commit 3c2587f26e
1 changed files with 13 additions and 11 deletions
--- a/core/java/android/view/TextureView.java
+++ b/core/java/android/view/TextureView.java
@@ -242,21 +242,23 @@ public class TextureView extends View {
    }

    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;
    }

    /**