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

Commit 8ac26e84 authored by Robert Carr's avatar Robert Carr Committed by android-build-merger
Browse files

Merge "SurfaceView: Avoid initializing Surface from an invalid... 

Merge "SurfaceView: Avoid initializing Surface from an invalid SurfaceControl." into oc-dev am: 401b8907
am: 5482790a

Change-Id: If186deb432621b5ce819ab9789b9dd57e324b440
parents b8d185f2 5482790a

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;