Merge "[View] vrr_bugfix_24q4 flag cleanup" into main (acc24657) · Commits · e / os / android_frameworks_base

core/java/android/view/ViewRootImpl.java

+3 −6

Original line number	Diff line number	Diff line
		@@ -1229,8 +1229,6 @@ public final class ViewRootImpl implements ViewParent,
		toolkitFrameRateVelocityMappingReadOnly();
		private static boolean sToolkitEnableInvalidateCheckThreadFlagValue =
		Flags.enableInvalidateCheckThread();
		private static boolean sSurfaceFlingerBugfixFlagValue =
		com.android.graphics.surfaceflinger.flags.Flags.vrrBugfix24q4();
		private static final boolean sEnableVrr = ViewProperties.vrr_enabled().orElse(true);
		private static final boolean sToolkitInitialTouchBoostFlagValue = toolkitInitialTouchBoost();
		private static boolean sToolkitFrameRateDebugFlagValue = toolkitFrameRateDebug();
		@@ -4526,7 +4524,7 @@ public final class ViewRootImpl implements ViewParent,
		}

		mDrawnThisFrame = false;
		if (!mInvalidationIdleMessagePosted && sSurfaceFlingerBugfixFlagValue) {
		if (!mInvalidationIdleMessagePosted) {
		mInvalidationIdleMessagePosted = true;
		mHandler.sendEmptyMessageDelayed(MSG_CHECK_INVALIDATION_IDLE, IDLE_TIME_MILLIS);
		}
		@@ -13404,8 +13402,7 @@ public final class ViewRootImpl implements ViewParent,
		*/
		public void removeThreadedRendererView(View view) {
		mThreadedRendererViews.remove(view);
		if (shouldEnableDvrr()
		&& !mInvalidationIdleMessagePosted && sSurfaceFlingerBugfixFlagValue) {
		if (shouldEnableDvrr() && !mInvalidationIdleMessagePosted) {
		mInvalidationIdleMessagePosted = true;
		mHandler.sendEmptyMessageDelayed(MSG_CHECK_INVALIDATION_IDLE, IDLE_TIME_MILLIS);
		}
		@@ -13636,7 +13633,7 @@ public final class ViewRootImpl implements ViewParent,
		mHandler.removeMessages(MSG_TOUCH_BOOST_TIMEOUT);
		mHandler.removeMessages(MSG_FRAME_RATE_SETTING);
		mHandler.removeMessages(MSG_SURFACE_REPLACED_TIMEOUT);
		if (mInvalidationIdleMessagePosted && sSurfaceFlingerBugfixFlagValue) {
		if (mInvalidationIdleMessagePosted) {
		mInvalidationIdleMessagePosted = false;
		mHandler.removeMessages(MSG_CHECK_INVALIDATION_IDLE);
		}

core/tests/coretests/src/android/view/ViewFrameRateTest.java

+4 −8

Original line number	Diff line number	Diff line
		@@ -1024,8 +1024,7 @@ public class ViewFrameRateTest {
		@LargeTest
		@Test
		@RequiresFlagsEnabled({FLAG_TOOLKIT_SET_FRAME_RATE_READ_ONLY,
		FLAG_TOOLKIT_FRAME_RATE_VIEW_ENABLING_READ_ONLY,
		com.android.graphics.surfaceflinger.flags.Flags.FLAG_VRR_BUGFIX_24Q4
		FLAG_TOOLKIT_FRAME_RATE_VIEW_ENABLING_READ_ONLY
		})
		public void idleDetected() throws Throwable {
		if (!ViewProperties.vrr_enabled().orElse(true)) {
		@@ -1051,8 +1050,7 @@ public class ViewFrameRateTest {
		@LargeTest
		@Test
		@RequiresFlagsEnabled({FLAG_TOOLKIT_SET_FRAME_RATE_READ_ONLY,
		FLAG_TOOLKIT_FRAME_RATE_VIEW_ENABLING_READ_ONLY,
		com.android.graphics.surfaceflinger.flags.Flags.FLAG_VRR_BUGFIX_24Q4
		FLAG_TOOLKIT_FRAME_RATE_VIEW_ENABLING_READ_ONLY
		})
		public void vectorDrawableFrameRate() throws Throwable {
		if (!ViewProperties.vrr_enabled().orElse(true)) {
		@@ -1111,8 +1109,7 @@ public class ViewFrameRateTest {
		@LargeTest
		@Test
		@RequiresFlagsEnabled({FLAG_TOOLKIT_SET_FRAME_RATE_READ_ONLY,
		FLAG_TOOLKIT_FRAME_RATE_VIEW_ENABLING_READ_ONLY,
		com.android.graphics.surfaceflinger.flags.Flags.FLAG_VRR_BUGFIX_24Q4
		FLAG_TOOLKIT_FRAME_RATE_VIEW_ENABLING_READ_ONLY
		})
		public void renderNodeAnimatorFrameRateCanceled() throws Throwable {
		if (!ViewProperties.vrr_enabled().orElse(true)) {
		@@ -1151,8 +1148,7 @@ public class ViewFrameRateTest {
		@LargeTest
		@Test
		@RequiresFlagsEnabled({FLAG_TOOLKIT_SET_FRAME_RATE_READ_ONLY,
		FLAG_TOOLKIT_FRAME_RATE_VIEW_ENABLING_READ_ONLY,
		com.android.graphics.surfaceflinger.flags.Flags.FLAG_VRR_BUGFIX_24Q4
		FLAG_TOOLKIT_FRAME_RATE_VIEW_ENABLING_READ_ONLY
		})
		public void renderNodeAnimatorFrameRateRemoved() throws Throwable {
		if (!ViewProperties.vrr_enabled().orElse(true)) {