Merge "Add toolkit_frame_rate_view_enabling_read_only to disable Toolkit functions" into main (94c30ca6) · Commits · e / os / android_frameworks_base

core/java/android/view/View.java

+10 −4

Original line number	Diff line number	Diff line
		@@ -43,6 +43,7 @@ import static android.view.flags.Flags.sensitiveContentAppProtection;
		import static android.view.flags.Flags.toolkitFrameRateBySizeReadOnly;
		import static android.view.flags.Flags.toolkitFrameRateDefaultNormalReadOnly;
		import static android.view.flags.Flags.toolkitFrameRateSmallUsesPercentReadOnly;
		import static android.view.flags.Flags.toolkitFrameRateViewEnablingReadOnly;
		import static android.view.flags.Flags.toolkitMetricsForFrameRateDecision;
		import static android.view.flags.Flags.toolkitSetFrameRateReadOnly;
		import static android.view.flags.Flags.viewVelocityApi;
		@@ -2439,6 +2440,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback,

		private static final boolean sToolkitFrameRateSmallUsesPercentReadOnlyFlagValue =
		toolkitFrameRateSmallUsesPercentReadOnly();
		private static final boolean sToolkitFrameRateViewEnablingReadOnlyFlagValue =
		toolkitFrameRateViewEnablingReadOnly();

		// Used to set frame rate compatibility.
		@Surface.FrameRateCompatibility int mFrameRateCompatibility =
		@@ -20794,7 +20797,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		}

		// For VRR to vote the preferred frame rate
		if (sToolkitSetFrameRateReadOnlyFlagValue) {
		if (sToolkitSetFrameRateReadOnlyFlagValue
		&& sToolkitFrameRateViewEnablingReadOnlyFlagValue) {
		votePreferredFrameRate();
		}

		@@ -20901,7 +20905,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		protected void damageInParent() {
		if (mParent != null && mAttachInfo != null) {
		// For VRR to vote the preferred frame rate
		if (sToolkitSetFrameRateReadOnlyFlagValue) {
		if (sToolkitSetFrameRateReadOnlyFlagValue
		&& sToolkitFrameRateViewEnablingReadOnlyFlagValue) {
		votePreferredFrameRate();
		}
		mParent.onDescendantInvalidated(this, this);
		@@ -23592,7 +23597,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		}

		mPrivateFlags4 = (mPrivateFlags4 & ~PFLAG4_HAS_MOVED) \| PFLAG4_HAS_DRAWN;
		if (sToolkitSetFrameRateReadOnlyFlagValue) {
		if (sToolkitSetFrameRateReadOnlyFlagValue
		&& sToolkitFrameRateViewEnablingReadOnlyFlagValue) {
		updateInfrequentCount();
		}

		@@ -25508,7 +25514,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		}

		private void sizeChange(int newWidth, int newHeight, int oldWidth, int oldHeight) {
		if (mAttachInfo != null) {
		if (mAttachInfo != null && sToolkitFrameRateViewEnablingReadOnlyFlagValue) {
		boolean isSmall;
		if (sToolkitFrameRateSmallUsesPercentReadOnlyFlagValue) {
		int size = newWidth * newHeight;

core/java/android/view/flags/refresh_rate_flags.aconfig

+8 −0

Original line number	Diff line number	Diff line
		@@ -104,3 +104,11 @@ flag {
		bug: "239979904"
		is_fixed_read_only: true
		}

		flag {
		name: "toolkit_frame_rate_view_enabling_read_only"
		namespace: "toolkit"
		description: "Feature flag to enable the functionality on views for the dVRR feature"
		bug: "239979904"
		is_fixed_read_only: true
		}
		No newline at end of file

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

+24 −9

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ import static android.view.Surface.FRAME_RATE_CATEGORY_LOW;
		import static android.view.Surface.FRAME_RATE_CATEGORY_NORMAL;
		import static android.view.Surface.FRAME_RATE_COMPATIBILITY_GTE;
		import static android.view.flags.Flags.FLAG_TOOLKIT_FRAME_RATE_VELOCITY_MAPPING_READ_ONLY;
		import static android.view.flags.Flags.FLAG_TOOLKIT_FRAME_RATE_VIEW_ENABLING_READ_ONLY;
		import static android.view.flags.Flags.FLAG_TOOLKIT_SET_FRAME_RATE_READ_ONLY;
		import static android.view.flags.Flags.FLAG_VIEW_VELOCITY_API;
		import static android.view.flags.Flags.toolkitFrameRateBySizeReadOnly;
		@@ -35,6 +36,8 @@ import static org.junit.Assert.assertTrue;
		import android.app.Activity;
		import android.os.SystemClock;
		import android.platform.test.annotations.RequiresFlagsEnabled;
		import android.platform.test.flag.junit.CheckFlagsRule;
		import android.platform.test.flag.junit.DeviceFlagsValueProvider;
		import android.util.DisplayMetrics;

		import androidx.test.annotation.UiThreadTest;
		@@ -60,6 +63,9 @@ public class ViewFrameRateTest {
		public ActivityTestRule<ViewCaptureTestActivity> mActivityRule = new ActivityTestRule<>(
		ViewCaptureTestActivity.class);

		@Rule
		public final CheckFlagsRule mCheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule();

		private Activity mActivity;
		private View mMovingView;
		private ViewRootImpl mViewRoot;
		@@ -80,7 +86,8 @@ public class ViewFrameRateTest {

		@UiThreadTest
		@Test
		@RequiresFlagsEnabled(FLAG_VIEW_VELOCITY_API)
		@RequiresFlagsEnabled({FLAG_VIEW_VELOCITY_API,
		FLAG_TOOLKIT_FRAME_RATE_VIEW_ENABLING_READ_ONLY})
		public void frameRateChangesWhenContentMoves() {
		mMovingView.offsetLeftAndRight(100);
		float frameRate = mViewRoot.getPreferredFrameRate();
		@@ -121,7 +128,8 @@ public class ViewFrameRateTest {

		@Test
		@RequiresFlagsEnabled({FLAG_VIEW_VELOCITY_API,
		FLAG_TOOLKIT_FRAME_RATE_VELOCITY_MAPPING_READ_ONLY})
		FLAG_TOOLKIT_FRAME_RATE_VELOCITY_MAPPING_READ_ONLY,
		FLAG_TOOLKIT_FRAME_RATE_VIEW_ENABLING_READ_ONLY})
		public void lowVelocity60() throws Throwable {
		mActivityRule.runOnUiThread(() -> {
		ViewGroup.LayoutParams layoutParams = mMovingView.getLayoutParams();
		@@ -140,7 +148,8 @@ public class ViewFrameRateTest {

		@Test
		@RequiresFlagsEnabled({FLAG_VIEW_VELOCITY_API,
		FLAG_TOOLKIT_FRAME_RATE_VELOCITY_MAPPING_READ_ONLY})
		FLAG_TOOLKIT_FRAME_RATE_VELOCITY_MAPPING_READ_ONLY,
		FLAG_TOOLKIT_FRAME_RATE_VIEW_ENABLING_READ_ONLY})
		public void highVelocity140() throws Throwable {
		mActivityRule.runOnUiThread(() -> {
		ViewGroup.LayoutParams layoutParams = mMovingView.getLayoutParams();
		@@ -172,7 +181,8 @@ public class ViewFrameRateTest {
		}

		@Test
		@RequiresFlagsEnabled(FLAG_TOOLKIT_SET_FRAME_RATE_READ_ONLY)
		@RequiresFlagsEnabled({FLAG_TOOLKIT_SET_FRAME_RATE_READ_ONLY,
		FLAG_TOOLKIT_FRAME_RATE_VIEW_ENABLING_READ_ONLY})
		public void noVelocityUsesCategorySmall() throws Throwable {
		final CountDownLatch drawLatch1 = new CountDownLatch(1);
		mActivityRule.runOnUiThread(() -> {
		@@ -206,7 +216,8 @@ public class ViewFrameRateTest {
		}

		@Test
		@RequiresFlagsEnabled(FLAG_TOOLKIT_SET_FRAME_RATE_READ_ONLY)
		@RequiresFlagsEnabled({FLAG_TOOLKIT_SET_FRAME_RATE_READ_ONLY,
		FLAG_TOOLKIT_FRAME_RATE_VIEW_ENABLING_READ_ONLY})
		public void noVelocityUsesCategoryNarrowWidth() throws Throwable {
		final CountDownLatch drawLatch1 = new CountDownLatch(1);
		mActivityRule.runOnUiThread(() -> {
		@@ -239,7 +250,8 @@ public class ViewFrameRateTest {
		}

		@Test
		@RequiresFlagsEnabled(FLAG_TOOLKIT_SET_FRAME_RATE_READ_ONLY)
		@RequiresFlagsEnabled({FLAG_TOOLKIT_SET_FRAME_RATE_READ_ONLY,
		FLAG_TOOLKIT_FRAME_RATE_VIEW_ENABLING_READ_ONLY})
		public void noVelocityUsesCategoryNarrowHeight() throws Throwable {
		final CountDownLatch drawLatch1 = new CountDownLatch(1);
		mActivityRule.runOnUiThread(() -> {
		@@ -272,7 +284,8 @@ public class ViewFrameRateTest {
		}

		@Test
		@RequiresFlagsEnabled(FLAG_TOOLKIT_SET_FRAME_RATE_READ_ONLY)
		@RequiresFlagsEnabled({FLAG_TOOLKIT_SET_FRAME_RATE_READ_ONLY,
		FLAG_TOOLKIT_FRAME_RATE_VIEW_ENABLING_READ_ONLY})
		public void noVelocityUsesCategoryLargeWidth() throws Throwable {
		final CountDownLatch drawLatch1 = new CountDownLatch(1);
		mActivityRule.runOnUiThread(() -> {
		@@ -305,7 +318,8 @@ public class ViewFrameRateTest {
		}

		@Test
		@RequiresFlagsEnabled(FLAG_TOOLKIT_SET_FRAME_RATE_READ_ONLY)
		@RequiresFlagsEnabled({FLAG_TOOLKIT_SET_FRAME_RATE_READ_ONLY,
		FLAG_TOOLKIT_FRAME_RATE_VIEW_ENABLING_READ_ONLY})
		public void noVelocityUsesCategoryLargeHeight() throws Throwable {
		final CountDownLatch drawLatch1 = new CountDownLatch(1);
		mActivityRule.runOnUiThread(() -> {
		@@ -338,7 +352,8 @@ public class ViewFrameRateTest {
		}

		@Test
		@RequiresFlagsEnabled(FLAG_TOOLKIT_SET_FRAME_RATE_READ_ONLY)
		@RequiresFlagsEnabled({FLAG_TOOLKIT_SET_FRAME_RATE_READ_ONLY,
		FLAG_TOOLKIT_FRAME_RATE_VIEW_ENABLING_READ_ONLY})
		public void defaultNormal() throws Throwable {
		mActivityRule.runOnUiThread(() -> {
		View parent = (View) mMovingView.getParent();

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

+18 −8

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ import static android.view.accessibility.Flags.FLAG_FORCE_INVERT_COLOR;
		import static android.view.flags.Flags.FLAG_TOOLKIT_SET_FRAME_RATE_READ_ONLY;
		import static android.view.flags.Flags.FLAG_TOOLKIT_FRAME_RATE_BY_SIZE_READ_ONLY;
		import static android.view.flags.Flags.FLAG_TOOLKIT_FRAME_RATE_FUNCTION_ENABLING_READ_ONLY;
		import static android.view.flags.Flags.FLAG_TOOLKIT_FRAME_RATE_VIEW_ENABLING_READ_ONLY;
		import static android.view.flags.Flags.FLAG_VIEW_VELOCITY_API;
		import static android.view.Surface.FRAME_RATE_CATEGORY_HIGH;
		import static android.view.Surface.FRAME_RATE_CATEGORY_HIGH_HINT;
		@@ -578,7 +579,8 @@ public class ViewRootImplTest {
		*/
		@Test
		@RequiresFlagsEnabled({FLAG_TOOLKIT_SET_FRAME_RATE_READ_ONLY,
		FLAG_TOOLKIT_FRAME_RATE_FUNCTION_ENABLING_READ_ONLY})
		FLAG_TOOLKIT_FRAME_RATE_FUNCTION_ENABLING_READ_ONLY,
		FLAG_TOOLKIT_FRAME_RATE_VIEW_ENABLING_READ_ONLY})
		public void votePreferredFrameRate_voteFrameRateCategory_visibility_defaultHigh() {
		View view = new View(sContext);
		attachViewToWindow(view);
		@@ -612,7 +614,8 @@ public class ViewRootImplTest {
		*/
		@Test
		@RequiresFlagsEnabled({FLAG_TOOLKIT_SET_FRAME_RATE_READ_ONLY,
		FLAG_TOOLKIT_FRAME_RATE_FUNCTION_ENABLING_READ_ONLY})
		FLAG_TOOLKIT_FRAME_RATE_FUNCTION_ENABLING_READ_ONLY,
		FLAG_TOOLKIT_FRAME_RATE_VIEW_ENABLING_READ_ONLY})
		public void votePreferredFrameRate_voteFrameRateCategory_smallSize_defaultHigh() {
		View view = new View(sContext);
		WindowManager.LayoutParams wmlp = new WindowManager.LayoutParams(TYPE_APPLICATION_OVERLAY);
		@@ -640,7 +643,8 @@ public class ViewRootImplTest {
		*/
		@Test
		@RequiresFlagsEnabled({FLAG_TOOLKIT_SET_FRAME_RATE_READ_ONLY,
		FLAG_TOOLKIT_FRAME_RATE_FUNCTION_ENABLING_READ_ONLY})
		FLAG_TOOLKIT_FRAME_RATE_FUNCTION_ENABLING_READ_ONLY,
		FLAG_TOOLKIT_FRAME_RATE_VIEW_ENABLING_READ_ONLY})
		public void votePreferredFrameRate_voteFrameRateCategory_normalSize_defaultHigh() {
		View view = new View(sContext);
		WindowManager.LayoutParams wmlp = new WindowManager.LayoutParams(TYPE_APPLICATION_OVERLAY);
		@@ -777,7 +781,8 @@ public class ViewRootImplTest {
		*/
		@Test
		@RequiresFlagsEnabled({FLAG_TOOLKIT_SET_FRAME_RATE_READ_ONLY,
		FLAG_TOOLKIT_FRAME_RATE_FUNCTION_ENABLING_READ_ONLY})
		FLAG_TOOLKIT_FRAME_RATE_FUNCTION_ENABLING_READ_ONLY,
		FLAG_TOOLKIT_FRAME_RATE_VIEW_ENABLING_READ_ONLY})
		public void votePreferredFrameRate_voteFrameRate_category() {
		View view = new View(sContext);
		attachViewToWindow(view);
		@@ -817,7 +822,9 @@ public class ViewRootImplTest {
		*/
		@Test
		@RequiresFlagsEnabled({FLAG_TOOLKIT_SET_FRAME_RATE_READ_ONLY,
		FLAG_VIEW_VELOCITY_API, FLAG_TOOLKIT_FRAME_RATE_FUNCTION_ENABLING_READ_ONLY})
		FLAG_VIEW_VELOCITY_API,
		FLAG_TOOLKIT_FRAME_RATE_FUNCTION_ENABLING_READ_ONLY,
		FLAG_TOOLKIT_FRAME_RATE_VIEW_ENABLING_READ_ONLY})
		public void votePreferredFrameRate_voteFrameRateCategory_velocityToHigh() {
		View view = new View(sContext);
		WindowManager.LayoutParams wmlp = new WindowManager.LayoutParams(TYPE_APPLICATION_OVERLAY);
		@@ -957,7 +964,8 @@ public class ViewRootImplTest {
		*/
		@Test
		@RequiresFlagsEnabled({FLAG_TOOLKIT_SET_FRAME_RATE_READ_ONLY,
		FLAG_TOOLKIT_FRAME_RATE_FUNCTION_ENABLING_READ_ONLY})
		FLAG_TOOLKIT_FRAME_RATE_FUNCTION_ENABLING_READ_ONLY,
		FLAG_TOOLKIT_FRAME_RATE_VIEW_ENABLING_READ_ONLY})
		public void votePreferredFrameRate_voteFrameRateOnly() {
		View view = new View(sContext);
		float frameRate = 20;
		@@ -1000,7 +1008,8 @@ public class ViewRootImplTest {
		*/
		@Test
		@RequiresFlagsEnabled({FLAG_TOOLKIT_SET_FRAME_RATE_READ_ONLY,
		FLAG_TOOLKIT_FRAME_RATE_FUNCTION_ENABLING_READ_ONLY})
		FLAG_TOOLKIT_FRAME_RATE_FUNCTION_ENABLING_READ_ONLY,
		FLAG_TOOLKIT_FRAME_RATE_VIEW_ENABLING_READ_ONLY})
		public void votePreferredFrameRate_infrequentLayer_defaultHigh() throws InterruptedException {
		final long delay = 200L;

		@@ -1102,7 +1111,8 @@ public class ViewRootImplTest {
		*/
		@Test
		@RequiresFlagsEnabled({FLAG_TOOLKIT_SET_FRAME_RATE_READ_ONLY,
		FLAG_TOOLKIT_FRAME_RATE_FUNCTION_ENABLING_READ_ONLY})
		FLAG_TOOLKIT_FRAME_RATE_FUNCTION_ENABLING_READ_ONLY,
		FLAG_TOOLKIT_FRAME_RATE_VIEW_ENABLING_READ_ONLY})
		public void votePreferredFrameRate_applyTextureViewHeuristic() throws InterruptedException {
		final long delay = 30L;