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

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

Merge "SurfaceView: Avoid initializing Surface from an invalid SurfaceControl." into oc-dev

parents 040b7749 7c67b7d0

core/java/android/view/SurfaceView.java

+2 −2
Original line number Diff line number Diff line
@@ -491,10 +491,10 @@ public class SurfaceView extends View implements ViewRootImpl.WindowStoppedCallb 
        if (myHeight <= 0) myHeight = getHeight();



        final boolean formatChanged = mFormat != mRequestedFormat;

        final boolean creating = (mSurfaceControl == null || formatChanged)

        final boolean visibleChanged = mVisible != mRequestedVisible;

        final boolean creating = (mSurfaceControl == null || formatChanged || visibleChanged)

                && mRequestedVisible;

        final boolean sizeChanged = mSurfaceWidth != myWidth || mSurfaceHeight != myHeight;

        final boolean visibleChanged = mVisible != mRequestedVisible;

        final boolean windowVisibleChanged = mWindowVisibility != mLastWindowVisibility;

        boolean redrawNeeded = false;