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

Commit 2fa5800d authored by Robert Carr's avatar Robert Carr Committed by android-build-merger
Browse files

Merge "SurfaceView: Fix missing override for SurfaceControl proxy" into oc-dev 

am: 42b3610a

Change-Id: Ib1001156c0a68f695d755da51af5f0548ccbacba
parents 78c9744f 42b3610a

core/java/android/view/SurfaceView.java

+6 −0
Original line number Original line Diff line number Diff line
@@ -1196,6 +1196,12 @@ public class SurfaceView extends View implements ViewRootImpl.WindowStoppedCallb 
            mBackgroundControl.deferTransactionUntil(handle, frame);

            mBackgroundControl.deferTransactionUntil(handle, frame);

        }

        }





        @Override

        public void deferTransactionUntil(Surface barrier, long frame) {

            super.deferTransactionUntil(barrier, frame);

            mBackgroundControl.deferTransactionUntil(barrier, frame);

        }



        void updateBackgroundVisibility() {

        void updateBackgroundVisibility() {

            if (mOpaque && mVisible) {

            if (mOpaque && mVisible) {

                mBackgroundControl.show();

                mBackgroundControl.show();