am 7835d4fb: Merge "Fix SurfaceView notifies on invalid surfaces."

* commit '7835d4fb4e99bac698599a269ce7f84f2de1fb46': Fix SurfaceView notifies on invalid surfaces.
2012-08-08 14:04:02 -07:00
parent 05e97e81a5 7835d4fb4e
commit 807c7ae00b
1 changed files with 1 additions and 1 deletions
--- 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;