summaryrefslogtreecommitdiff
path: root/core/java/android/view/SurfaceView.java
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-08-08 14:08:38 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-08-08 14:08:38 -0700
commit88a4292186fef902db476d63529d0b15a17d9d4d (patch)
treec6759dc3f5532ddb88cfed394a189f3a534094cb /core/java/android/view/SurfaceView.java
parentb6039811fa0fbc23f25c47491810faeb04ce3125 (diff)
parent807c7ae00bc5b8a7fe68ba4acbfa3909a955ae70 (diff)
am 807c7ae0: am 7835d4fb: Merge "Fix SurfaceView notifies on invalid surfaces."
* commit '807c7ae00bc5b8a7fe68ba4acbfa3909a955ae70': Fix SurfaceView notifies on invalid surfaces.
Diffstat (limited to 'core/java/android/view/SurfaceView.java')
-rw-r--r--core/java/android/view/SurfaceView.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/view/SurfaceView.java b/core/java/android/view/SurfaceView.java
index d3457b38be2f..f4d40cbcac13 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;