Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6742c3f1 authored by Shane's avatar Shane
Browse files

Apply HIGH_HINT to hint refresh rate boost by user interactions 

Use HIGH_HINT instead of HIGH to boost frame rate if touch boost happens. This
information is helpful for CoGs team to disable touch boost for games.

Bug: 315071842
Test: atest ViewRootImplTest
Change-Id: I6131c60272b4d01e3b99c138c0cf2c391017459b
parent ff26a560

core/java/android/view/ViewRootImpl.java

+18 −6
Original line number Original line Diff line number Diff line
@@ -26,6 +26,7 @@ import static android.view.Display.INVALID_DISPLAY; 
import static android.view.InputDevice.SOURCE_CLASS_NONE;

import static android.view.InputDevice.SOURCE_CLASS_NONE;

import static android.view.InsetsSource.ID_IME;

import static android.view.InsetsSource.ID_IME;

import static android.view.Surface.FRAME_RATE_CATEGORY_HIGH;

import static android.view.Surface.FRAME_RATE_CATEGORY_HIGH;

import static android.view.Surface.FRAME_RATE_CATEGORY_HIGH_HINT;

import static android.view.Surface.FRAME_RATE_CATEGORY_NO_PREFERENCE;

import static android.view.Surface.FRAME_RATE_CATEGORY_NO_PREFERENCE;

import static android.view.View.PFLAG_DRAW_ANIMATION;

import static android.view.View.PFLAG_DRAW_ANIMATION;

import static android.view.View.SYSTEM_UI_FLAG_FULLSCREEN;

import static android.view.View.SYSTEM_UI_FLAG_FULLSCREEN;
@@ -1011,8 +1012,10 @@ public final class ViewRootImpl implements ViewParent, 
    // Used to check if there were any view invalidations in

    // Used to check if there were any view invalidations in

    // the previous time frame (FRAME_RATE_IDLENESS_REEVALUATE_TIME).

    // the previous time frame (FRAME_RATE_IDLENESS_REEVALUATE_TIME).

    private boolean mHasInvalidation = false;

    private boolean mHasInvalidation = false;

    // Used to check if it is in the touch boosting period.

    // Used to check if it is in the frame rate boosting period.

    private boolean mIsFrameRateBoosting = false;

    private boolean mIsFrameRateBoosting = false;

    // Used to check if it is in touch boosting period.

    private boolean mIsTouchBoosting = false;

    // Used to check if there is a message in the message queue

    // Used to check if there is a message in the message queue

    // for idleness handling.

    // for idleness handling.

    private boolean mHasIdledMessage = false;

    private boolean mHasIdledMessage = false;
@@ -6421,11 +6424,12 @@ public final class ViewRootImpl implements ViewParent, 
                     * Lower the frame rate after the boosting period (FRAME_RATE_TOUCH_BOOST_TIME).

                     * Lower the frame rate after the boosting period (FRAME_RATE_TOUCH_BOOST_TIME).

                     */

                     */

                    mIsFrameRateBoosting = false;

                    mIsFrameRateBoosting = false;

                    mIsTouchBoosting = false;

                    setPreferredFrameRateCategory(Math.max(mPreferredFrameRateCategory,

                    setPreferredFrameRateCategory(Math.max(mPreferredFrameRateCategory,

                            mLastPreferredFrameRateCategory));

                            mLastPreferredFrameRateCategory));

                    break;

                    break;

                case MSG_CHECK_INVALIDATION_IDLE:

                case MSG_CHECK_INVALIDATION_IDLE:

                    if (!mHasInvalidation && !mIsFrameRateBoosting) {

                    if (!mHasInvalidation && !mIsFrameRateBoosting && !mIsTouchBoosting) {

                        mPreferredFrameRateCategory = FRAME_RATE_CATEGORY_NO_PREFERENCE;

                        mPreferredFrameRateCategory = FRAME_RATE_CATEGORY_NO_PREFERENCE;

                        setPreferredFrameRateCategory(mPreferredFrameRateCategory);

                        setPreferredFrameRateCategory(mPreferredFrameRateCategory);

                        mHasIdledMessage = false;

                        mHasIdledMessage = false;
@@ -7448,7 +7452,7 @@ public final class ViewRootImpl implements ViewParent, 
            // For the variable refresh rate project

            // For the variable refresh rate project

            if (handled && shouldTouchBoost(action, mWindowAttributes.type)) {

            if (handled && shouldTouchBoost(action, mWindowAttributes.type)) {

                // set the frame rate to the maximum value.

                // set the frame rate to the maximum value.

                mIsFrameRateBoosting = true;

                mIsTouchBoosting = true;

                setPreferredFrameRateCategory(mPreferredFrameRateCategory);

                setPreferredFrameRateCategory(mPreferredFrameRateCategory);

            }

            }

            /**

            /**
@@ -7456,7 +7460,7 @@ public final class ViewRootImpl implements ViewParent, 
             * MotionEvent.ACTION_CANCEL is detected.

             * MotionEvent.ACTION_CANCEL is detected.

             * Not using ACTION_MOVE to avoid checking and sending messages too frequently.

             * Not using ACTION_MOVE to avoid checking and sending messages too frequently.

             */

             */

            if (mIsFrameRateBoosting && (action == MotionEvent.ACTION_UP

            if (mIsTouchBoosting && (action == MotionEvent.ACTION_UP

                    || action == MotionEvent.ACTION_CANCEL)) {

                    || action == MotionEvent.ACTION_CANCEL)) {

                mHandler.removeMessages(MSG_TOUCH_BOOST_TIMEOUT);

                mHandler.removeMessages(MSG_TOUCH_BOOST_TIMEOUT);

                mHandler.sendEmptyMessageDelayed(MSG_TOUCH_BOOST_TIMEOUT,

                mHandler.sendEmptyMessageDelayed(MSG_TOUCH_BOOST_TIMEOUT,
@@ -12200,8 +12204,16 @@ public final class ViewRootImpl implements ViewParent, 
            return;

            return;

        }

        }

















        int frameRateCategory = mIsFrameRateBoosting || mInsetsAnimationRunning







        int frameRateCategory = mIsTouchBoosting











                ? FRAME_RATE_CATEGORY_HIGH : preferredFrameRateCategory;







                ? FRAME_RATE_CATEGORY_HIGH_HINT : preferredFrameRateCategory;



























        // FRAME_RATE_CATEGORY_HIGH has a higher precedence than FRAME_RATE_CATEGORY_HIGH_HINT














        // For now, FRAME_RATE_CATEGORY_HIGH_HINT is used for boosting with user interaction.














        // FRAME_RATE_CATEGORY_HIGH is for boosting without user interaction














        // (e.g., Window Initialization).














        if (mIsFrameRateBoosting || mInsetsAnimationRunning) {














            frameRateCategory = FRAME_RATE_CATEGORY_HIGH;














        }



























        try {







        try {











            if (mLastPreferredFrameRateCategory != frameRateCategory) {







            if (mLastPreferredFrameRateCategory != frameRateCategory) {

































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



+6
−0




























Original line number
Original line
Diff line number
Diff line








@@ -19,6 +19,7 @@ package android.view;









import static android.view.accessibility.Flags.FLAG_FORCE_INVERT_COLOR;







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_SET_FRAME_RATE_READ_ONLY;











import static android.view.Surface.FRAME_RATE_CATEGORY_HIGH;







import static android.view.Surface.FRAME_RATE_CATEGORY_HIGH;














import static android.view.Surface.FRAME_RATE_CATEGORY_HIGH_HINT;











import static android.view.Surface.FRAME_RATE_CATEGORY_LOW;







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_CATEGORY_NORMAL;











import static android.view.Surface.FRAME_RATE_CATEGORY_NO_PREFERENCE;







import static android.view.Surface.FRAME_RATE_CATEGORY_NO_PREFERENCE;










@@ -575,8 +576,13 @@ public class ViewRootImplTest {









            assertEquals(viewRootImpl.getPreferredFrameRateCategory(), FRAME_RATE_CATEGORY_LOW);







            assertEquals(viewRootImpl.getPreferredFrameRateCategory(), FRAME_RATE_CATEGORY_LOW);











            viewRootImpl.votePreferredFrameRateCategory(FRAME_RATE_CATEGORY_NORMAL);







            viewRootImpl.votePreferredFrameRateCategory(FRAME_RATE_CATEGORY_NORMAL);











            assertEquals(viewRootImpl.getPreferredFrameRateCategory(), FRAME_RATE_CATEGORY_NORMAL);







            assertEquals(viewRootImpl.getPreferredFrameRateCategory(), FRAME_RATE_CATEGORY_NORMAL);














            viewRootImpl.votePreferredFrameRateCategory(FRAME_RATE_CATEGORY_HIGH_HINT);














            assertEquals(viewRootImpl.getPreferredFrameRateCategory(),














                    FRAME_RATE_CATEGORY_HIGH_HINT);











            viewRootImpl.votePreferredFrameRateCategory(FRAME_RATE_CATEGORY_HIGH);







            viewRootImpl.votePreferredFrameRateCategory(FRAME_RATE_CATEGORY_HIGH);











            assertEquals(viewRootImpl.getPreferredFrameRateCategory(), FRAME_RATE_CATEGORY_HIGH);







            assertEquals(viewRootImpl.getPreferredFrameRateCategory(), FRAME_RATE_CATEGORY_HIGH);














            viewRootImpl.votePreferredFrameRateCategory(FRAME_RATE_CATEGORY_HIGH_HINT);














            assertEquals(viewRootImpl.getPreferredFrameRateCategory(), FRAME_RATE_CATEGORY_HIGH);











            viewRootImpl.votePreferredFrameRateCategory(FRAME_RATE_CATEGORY_NORMAL);







            viewRootImpl.votePreferredFrameRateCategory(FRAME_RATE_CATEGORY_NORMAL);











            assertEquals(viewRootImpl.getPreferredFrameRateCategory(), FRAME_RATE_CATEGORY_HIGH);







            assertEquals(viewRootImpl.getPreferredFrameRateCategory(), FRAME_RATE_CATEGORY_HIGH);











            viewRootImpl.votePreferredFrameRateCategory(FRAME_RATE_CATEGORY_LOW);







            viewRootImpl.votePreferredFrameRateCategory(FRAME_RATE_CATEGORY_LOW);