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

am 35e04a1a: Merge "Fix NPE in setSurfaceTexure" into mnc-dev

Browse Source 
* commit '35e04a1adfb763fd3a0cb7a345b37093ce8990a9':
  Fix NPE in setSurfaceTexure
This commit is contained in:
John Reck
2015-05-20 14:27:39 +00:00
committed by Android Git Automerger
parent ceddfcbffd 35e04a1adf
commit 10a024bf45
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -730,9 +730,13 @@ public class TextureView extends View {
} }
mSurface = surfaceTexture; mSurface = surfaceTexture;
// If the view is visible, update the listener in the new surface to use /*
// the existing listener in the view. * If the view is visible and we already made a layer, update the
if (((mViewFlags & VISIBILITY_MASK) == VISIBLE)) { * listener in the new surface to use the existing listener in the view.
* Otherwise this will be called when the view becomes visible or the
* layer is created
*/
if (((mViewFlags & VISIBILITY_MASK) == VISIBLE) && mLayer != null) {
mSurface.setOnFrameAvailableListener(mUpdateListener, mAttachInfo.mHandler); mSurface.setOnFrameAvailableListener(mUpdateListener, mAttachInfo.mHandler);
} }
mUpdateSurface = true; mUpdateSurface = true;