Merge "SurfaceControl: Fix builder" into sc-dev (79f15c60) · Commits · e / os / android_frameworks_base

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
		*/