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

am 7f0d1e19: Merge "Fix NPE in onVisibilityChanged" into lmp-preview-dev

Browse Source 
* commit '7f0d1e193bbf2dc189c2de6e3329aac0afda1d76':
  Fix NPE in onVisibilityChanged
This commit is contained in:
John Reck
2014-05-30 01:06:22 +00:00
committed by Android Git Automerger
parent 4027db5c3d 432fe98297
commit 30643dfcd1
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -405,7 +405,9 @@ public class TextureView extends View {
// To cancel updates, the easiest thing to do is simply to remove the
// updates listener
if (visibility == VISIBLE) {
mSurface.setOnFrameAvailableListener(mUpdateListener, mAttachInfo.mHandler);
if (mLayer != null) {
mSurface.setOnFrameAvailableListener(mUpdateListener, mAttachInfo.mHandler);
}
updateLayerAndInvalidate();
} else {
mSurface.setOnFrameAvailableListener(null);