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

Commit 58679382 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "SurfaceView only call forceDisconnect if isValid am: 6ba466ff am:... 

Merge "SurfaceView only call forceDisconnect if isValid am: 6ba466ff am: 5a0da698 am: 88123c4e"
parents 62622831 15473e00

core/java/android/view/SurfaceView.java

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

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

                            // the surface.

                            if (mSurface.isValid()) {

                                mSurface.forceScopedDisconnect();

                            }

                        }

                    }



                    mSurface.transferFrom(mNewSurface);

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