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

Commit e5e9c56f authored by Alec Mouri's avatar Alec Mouri Committed by Android (Google) Code Review
Browse files

Merge "Don't always send hdr headroom in SurfaceView" into main

parents c918f413 90c0aba8

core/java/android/view/SurfaceView.java

+3 −3
Original line number Original line Diff line number Diff line
@@ -951,7 +951,7 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall 




    private boolean performSurfaceTransaction(ViewRootImpl viewRoot, Translator translator,

    private boolean performSurfaceTransaction(ViewRootImpl viewRoot, Translator translator,

            boolean creating, boolean sizeChanged, boolean hintChanged, boolean relativeZChanged,

            boolean creating, boolean sizeChanged, boolean hintChanged, boolean relativeZChanged,

            Transaction surfaceUpdateTransaction) {

            boolean hdrHeadroomChanged, Transaction surfaceUpdateTransaction) {

        boolean realSizeChanged = false;

        boolean realSizeChanged = false;





        mSurfaceLock.lock();

        mSurfaceLock.lock();
@@ -986,7 +986,7 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall 




            updateBackgroundVisibility(surfaceUpdateTransaction);

            updateBackgroundVisibility(surfaceUpdateTransaction);

            updateBackgroundColor(surfaceUpdateTransaction);

            updateBackgroundColor(surfaceUpdateTransaction);

            if (mLimitedHdrEnabled) {

            if (mLimitedHdrEnabled && hdrHeadroomChanged) {

                surfaceUpdateTransaction.setDesiredHdrHeadroom(

                surfaceUpdateTransaction.setDesiredHdrHeadroom(

                        mBlastSurfaceControl, mHdrHeadroom);

                        mBlastSurfaceControl, mHdrHeadroom);

            }

            }
@@ -1203,7 +1203,7 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall 
                }

                }





                final boolean realSizeChanged = performSurfaceTransaction(viewRoot, translator,

                final boolean realSizeChanged = performSurfaceTransaction(viewRoot, translator,

                        creating, sizeChanged, hintChanged, relativeZChanged,

                        creating, sizeChanged, hintChanged, relativeZChanged, hdrHeadroomChanged,

                        surfaceUpdateTransaction);

                        surfaceUpdateTransaction);





                try {

                try {