Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix NPE in TextureView

Browse Source 
am: 3c2587f26e

Change-Id: I79f35e5029cb3abb5fa74a60e448cd09835e2112
This commit is contained in:
John Reck
2016-08-04 16:43:29 +00:00
committed by android-build-merger
parent 31cde3cd69 3c2587f26e
commit 8fe31ec0e0
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/java/android/view/TextureView.java
View File

@@ -242,21 +242,23 @@ public class TextureView extends View {
} }
private void releaseSurfaceTexture() { private void releaseSurfaceTexture() {
boolean shouldRelease = true; if (mSurface != null) {
boolean shouldRelease = true;
if (mListener != null) { if (mListener != null) {
shouldRelease = mListener.onSurfaceTextureDestroyed(mSurface); shouldRelease = mListener.onSurfaceTextureDestroyed(mSurface);
} }
synchronized (mNativeWindowLock) { synchronized (mNativeWindowLock) {
nDestroyNativeWindow(); nDestroyNativeWindow();
} }
if (shouldRelease) { if (shouldRelease) {
mSurface.release(); mSurface.release();
}
mSurface = null;
mHadSurface = true;
} }
mSurface = null;
mHadSurface = true;
} }
/** /**