diff options
| -rw-r--r-- | core/java/android/view/ViewRootImpl.java | 7 | ||||
| -rw-r--r-- | core/tests/coretests/src/android/view/ViewFrameRateTest.java | 3 |
2 files changed, 7 insertions, 3 deletions
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index 139285a44817..3204499e375c 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -1110,6 +1110,8 @@ public final class ViewRootImpl implements ViewParent, FRAME_RATE_COMPATIBILITY_FIXED_SOURCE; // time for touch boost period. private static final int FRAME_RATE_TOUCH_BOOST_TIME = 3000; + // Timeout for the other frame rate boosts other than touch boost. + private static final int FRAME_RATE_BOOST_TIME = 3000; // time for evaluating the interval between current time and // the time when frame rate was set previously. private static final int FRAME_RATE_SETTING_REEVALUATE_TIME = 100; @@ -3414,7 +3416,7 @@ public final class ViewRootImpl implements ViewParent, if (shouldEnableDvrr() && viewVisibility == View.VISIBLE) { // Boost frame rate when the viewVisibility becomes true. // This is mainly for lanuchers that lanuch new windows. - boostFrameRate(FRAME_RATE_TOUCH_BOOST_TIME); + boostFrameRate(FRAME_RATE_BOOST_TIME); } } @@ -4146,7 +4148,7 @@ public final class ViewRootImpl implements ViewParent, if (shouldEnableDvrr()) { // Boost the frame rate when the ViewRootImpl first becomes available. - boostFrameRate(FRAME_RATE_TOUCH_BOOST_TIME); + boostFrameRate(FRAME_RATE_BOOST_TIME); } } @@ -12912,6 +12914,7 @@ public final class ViewRootImpl implements ViewParent, } if (frameRateCompatibility == FRAME_RATE_COMPATIBILITY_GTE) { mIsTouchBoosting = false; + mIsFrameRateBoosting = false; if (!sToolkitFrameRateVelocityMappingReadOnlyFlagValue) { mPreferredFrameRateCategory = FRAME_RATE_CATEGORY_HIGH; mFrameRateCategoryHighCount = FRAME_RATE_CATEGORY_COUNT; diff --git a/core/tests/coretests/src/android/view/ViewFrameRateTest.java b/core/tests/coretests/src/android/view/ViewFrameRateTest.java index 07446e7617aa..7236f305ac56 100644 --- a/core/tests/coretests/src/android/view/ViewFrameRateTest.java +++ b/core/tests/coretests/src/android/view/ViewFrameRateTest.java @@ -126,7 +126,7 @@ public class ViewFrameRateTest { @Test @RequiresFlagsEnabled(FLAG_VIEW_VELOCITY_API) - public void touchBoostDisable() throws Throwable { + public void frameBoostDisable() throws Throwable { mActivityRule.runOnUiThread(() -> { long now = SystemClock.uptimeMillis(); MotionEvent down = MotionEvent.obtain( @@ -146,6 +146,7 @@ public class ViewFrameRateTest { mActivityRule.runOnUiThread(() -> { assertFalse(mViewRoot.getIsTouchBoosting()); + assertFalse(mViewRoot.getIsFrameRateBoosting()); }); } |