Merge "SurfaceControl: Fix builder" into sc-dev

2021-04-21 05:22:27 +00:00
parent 3318dbf7bb c3d4925a04
commit 79f15c60f3
1 changed files with 2 additions and 6 deletions
--- a/core/java/android/view/SurfaceControl.java
+++ b/core/java/android/view/SurfaceControl.java
@@ -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
         */