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

Commit de6e849f authored by Jian-Syuan (Shane) Wong's avatar Jian-Syuan (Shane) Wong Committed by Android (Google) Code Review
Browse files

Revert "Apply HIGH_HINT to hint refresh rate boost by user interactions" 

This reverts commit 92db7e3e.

Reason for revert: b/321107394

Change-Id: If3bba4a1d1fa801b9e6f63ef3bc95ce30ed85720
parent 92db7e3e

core/java/android/view/ViewRootImpl.java

+5 −17
Original line number Original line Diff line number Diff line
@@ -26,7 +26,6 @@ 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;
@@ -1010,10 +1009,8 @@ 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 frame rate boosting period.

    // Used to check if it is in the touch 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;
@@ -6428,12 +6425,11 @@ 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 && !mIsTouchBoosting) {

                    if (!mHasInvalidation && !mIsFrameRateBoosting) {

                        mPreferredFrameRateCategory = FRAME_RATE_CATEGORY_NO_PREFERENCE;

                        mPreferredFrameRateCategory = FRAME_RATE_CATEGORY_NO_PREFERENCE;

                        setPreferredFrameRateCategory(mPreferredFrameRateCategory);

                        setPreferredFrameRateCategory(mPreferredFrameRateCategory);

                        mHasIdledMessage = false;

                        mHasIdledMessage = false;
@@ -7456,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.

                mIsTouchBoosting = true;

                mIsFrameRateBoosting = true;

                setPreferredFrameRateCategory(mPreferredFrameRateCategory);

                setPreferredFrameRateCategory(mPreferredFrameRateCategory);

            }

            }

            /**

            /**
@@ -12181,16 +12177,8 @@ public final class ViewRootImpl implements ViewParent, 
            return;

            return;

        }

        }

















        int frameRateCategory = mIsTouchBoosting







        int frameRateCategory = mIsFrameRateBoosting || mInsetsAnimationRunning











                ? FRAME_RATE_CATEGORY_HIGH_HINT : preferredFrameRateCategory;







                ? FRAME_RATE_CATEGORY_HIGH : 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



+0
−6




























Original line number
Original line
Diff line number
Diff line








@@ -19,7 +19,6 @@ 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;










@@ -576,13 +575,8 @@ 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);