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

Commit 68349442 authored by Rob Carr's avatar Rob Carr Committed by android-build-merger
Browse files

Merge "SurfaceView: Wait to gather transparent region." into oc-dev am: d9bf5ecf 

am: 3c78e73a

Change-Id: Ifff868614ab70d9b99344abc41eab67745068937
parents 568f6009 3c78e73a

core/java/android/view/SurfaceView.java

+3 −2
Original line number Diff line number Diff line
@@ -138,6 +138,8 @@ public class SurfaceView extends View implements ViewRootImpl.WindowStoppedCallb 
                case DRAW_FINISHED_MSG: {

                    mDrawFinished = true;

                    if (mAttachedToWindow) {

                        mParent.requestTransparentRegion(SurfaceView.this);



                        notifyDrawFinished();

                        invalidate();

                    }
@@ -247,7 +249,6 @@ public class SurfaceView extends View implements ViewRootImpl.WindowStoppedCallb 
        getViewRootImpl().addWindowStoppedCallback(this);

        mWindowStopped = false;



        mParent.requestTransparentRegion(this);

        mViewVisibility = getVisibility() == VISIBLE;

        updateRequestedVisibility();
@@ -352,7 +353,7 @@ public class SurfaceView extends View implements ViewRootImpl.WindowStoppedCallb 


    @Override

    public boolean gatherTransparentRegion(Region region) {

        if (isAboveParent()) {

        if (isAboveParent() || !mDrawFinished) {

            return super.gatherTransparentRegion(region);

        }