From c3d4925a045b5a1406602ce09897f254c649ab06 Mon Sep 17 00:00:00 2001 From: Robert Carr Date: Tue, 20 Apr 2021 16:41:12 -0700 Subject: [PATCH] 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 --- core/java/android/view/SurfaceControl.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/core/java/android/view/SurfaceControl.java b/core/java/android/view/SurfaceControl.java index 83669fa96a9b5..3ff7a65b6c6a9 100644 --- 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 */