Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 00515f8e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "SurfaceView only call forceDisconnect if isValid" into nyc-mr1-dev

parents ab262da7 6ba466ff

core/java/android/view/SurfaceView.java

+3 −1
Original line number Original line Diff line number Diff line
@@ -598,9 +598,11 @@ public class SurfaceView extends View { 
                            // surfaceDestroyed and surfaceCreated, we force a disconnect,

                            // surfaceDestroyed and surfaceCreated, we force a disconnect,

                            // so the next connect will always work if we end up reusing

                            // so the next connect will always work if we end up reusing

                            // the surface.

                            // the surface.

                            if (mSurface.isValid()) {

                                mSurface.forceScopedDisconnect();

                                mSurface.forceScopedDisconnect();

                            }

                            }

                        }

                        }

                    }





                    mSurface.transferFrom(mNewSurface);

                    mSurface.transferFrom(mNewSurface);

                    if (visible && mSurface.isValid()) {

                    if (visible && mSurface.isValid()) {