Merge "Invoke setColorSpaceAgnostic only when needed" into main (89c9ff26) · Commits · e / os / android_frameworks_base

core/java/android/view/ViewRootImpl.java

+10 −2

Original line number	Diff line number	Diff line
		@@ -1000,6 +1000,7 @@ public final class ViewRootImpl implements ViewParent,
		private final ImeFocusController mImeFocusController;

		private boolean mIsSurfaceOpaque;
		private boolean mIsSurfaceColorSpaceAgnostic;

		private final BackgroundBlurDrawable.Aggregator mBlurRegionAggregator =
		new BackgroundBlurDrawable.Aggregator(this);
		@@ -3906,12 +3907,19 @@ public final class ViewRootImpl implements ViewParent,
		}

		if (setScPropertiesInClient()) {
		if (surfaceControlChanged) {
		// Reset to default for a new SurfaceControl.
		mIsSurfaceColorSpaceAgnostic = false;
		}
		if (surfaceControlChanged \|\| windowAttributesChanged) {
		boolean colorSpaceAgnostic = (lp.privateFlags
		& WindowManager.LayoutParams.PRIVATE_FLAG_COLOR_SPACE_AGNOSTIC)
		!= 0;
		mTransaction.setColorSpaceAgnostic(mSurfaceControl, colorSpaceAgnostic)
		.apply();
		if (colorSpaceAgnostic != mIsSurfaceColorSpaceAgnostic) {
		mIsSurfaceColorSpaceAgnostic = colorSpaceAgnostic;
		mTransaction.setColorSpaceAgnostic(
		mSurfaceControl, colorSpaceAgnostic).applyAsyncUnsafe();
		}
		}
		}
		}