diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-08-08 14:04:02 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-08 14:04:02 -0700 |
| commit | 807c7ae00bc5b8a7fe68ba4acbfa3909a955ae70 (patch) | |
| tree | b171c8349602f687a5a344202c627f8b860ad5f9 /core/java/android/view/SurfaceView.java | |
| parent | 05e97e81a5fa2c9cab4cdda15aa2d036243a0c0e (diff) | |
| parent | 7835d4fb4e99bac698599a269ce7f84f2de1fb46 (diff) | |
am 7835d4fb: Merge "Fix SurfaceView notifies on invalid surfaces."
* commit '7835d4fb4e99bac698599a269ce7f84f2de1fb46':
Fix SurfaceView notifies on invalid surfaces.
Diffstat (limited to 'core/java/android/view/SurfaceView.java')
| -rw-r--r-- | core/java/android/view/SurfaceView.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/view/SurfaceView.java b/core/java/android/view/SurfaceView.java index fd302dc5b359..ed4c75cdb452 100644 --- a/core/java/android/view/SurfaceView.java +++ b/core/java/android/view/SurfaceView.java @@ -531,7 +531,7 @@ public class SurfaceView extends View { mSurface.transferFrom(mNewSurface); - if (visible) { + if (visible && mSurface.isValid()) { if (!mSurfaceCreated && (surfaceChanged || visibleChanged)) { mSurfaceCreated = true; mIsCreating = true; |