diff options
| -rw-r--r-- | core/java/android/view/View.java | 2 | ||||
| -rw-r--r-- | core/tests/coretests/src/android/view/ViewFrameRateTest.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index f4d240882e93..a27d4019c120 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -5773,7 +5773,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, */ private static final float FRAME_RATE_SIZE_PERCENTAGE_THRESHOLD = 0.07f; - static final float MAX_FRAME_RATE = 140; + static final float MAX_FRAME_RATE = 120; // The preferred frame rate of the view that is mainly used for // touch boosting, view velocity handling, and TextureView. diff --git a/core/tests/coretests/src/android/view/ViewFrameRateTest.java b/core/tests/coretests/src/android/view/ViewFrameRateTest.java index 32aec1a335f2..5c7df04b0412 100644 --- a/core/tests/coretests/src/android/view/ViewFrameRateTest.java +++ b/core/tests/coretests/src/android/view/ViewFrameRateTest.java @@ -196,7 +196,7 @@ public class ViewFrameRateTest { @RequiresFlagsEnabled({FLAG_VIEW_VELOCITY_API, FLAG_TOOLKIT_FRAME_RATE_VELOCITY_MAPPING_READ_ONLY, FLAG_TOOLKIT_FRAME_RATE_VIEW_ENABLING_READ_ONLY}) - public void highVelocity140() throws Throwable { + public void highVelocity120() throws Throwable { mActivityRule.runOnUiThread(() -> { ViewGroup.LayoutParams layoutParams = mMovingView.getLayoutParams(); layoutParams.width = ViewGroup.LayoutParams.MATCH_PARENT; @@ -208,7 +208,7 @@ public class ViewFrameRateTest { mMovingView.setFrameContentVelocity(1_000_000_000f); mMovingView.invalidate(); runAfterDraw(() -> { - assertEquals(140f, mViewRoot.getLastPreferredFrameRate(), 0f); + assertEquals(120f, mViewRoot.getLastPreferredFrameRate(), 0f); }); }); waitForAfterDraw(); |