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

Commit c3d4925a authored by Robert Carr's avatar Robert Carr
Browse files

SurfaceControl: Fix builder 

Recently introduced check for isBufferQueueLayer doesn't work
because the FX_SURFACE_NORMAL flag is 0x0 not 0x1 as expected.

Bug: 185941687
Test: Existing tests pass
Change-Id: I1b341bffcd8b0f0c0e7f2e3da27cb201b6e1d6ff
parent a23475b1

core/java/android/view/SurfaceControl.java

+2 −6
Original line number Diff line number Diff line
@@ -1085,8 +1085,8 @@ public final class SurfaceControl implements Parcelable { 
                throw new IllegalStateException(

                        "Only buffer layers can set a valid buffer size.");

            }

            boolean isBqLayer = isBufferQueueLayer();

            if (isBqLayer) {



            if ((mFlags & FX_SURFACE_MASK) == FX_SURFACE_NORMAL) {

                setBLASTLayer();

            }
@@ -1310,10 +1310,6 @@ public final class SurfaceControl implements Parcelable { 
            return  (mFlags & FX_SURFACE_EFFECT) == FX_SURFACE_EFFECT;

        }



        private boolean isBufferQueueLayer() {

            return (mFlags & FX_SURFACE_NORMAL) == FX_SURFACE_NORMAL;

        }



        /**

         * @hide

         */