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

Commit af54fbaa authored by ramindani's avatar ramindani
Browse files

[View] vrr_bugfix_24q4 flag cleanup 

BUG: 331513837
Test: atest ViewFrameRateTest
Flag: EXEMPT cleanup
Change-Id: Iaf005030a80692ddb63c54c33ec61637ac7326f3
parent 56a7fd9e

core/java/android/view/ViewRootImpl.java

+3 −6
Original line number Original line Diff line number Diff line
@@ -1226,8 +1226,6 @@ public final class ViewRootImpl implements ViewParent, 
            toolkitFrameRateVelocityMappingReadOnly();

            toolkitFrameRateVelocityMappingReadOnly();

    private static boolean sToolkitEnableInvalidateCheckThreadFlagValue =

    private static boolean sToolkitEnableInvalidateCheckThreadFlagValue =

            Flags.enableInvalidateCheckThread();

            Flags.enableInvalidateCheckThread();

    private static boolean sSurfaceFlingerBugfixFlagValue =

            com.android.graphics.surfaceflinger.flags.Flags.vrrBugfix24q4();

    private static final boolean sEnableVrr = ViewProperties.vrr_enabled().orElse(true);

    private static final boolean sEnableVrr = ViewProperties.vrr_enabled().orElse(true);

    private static final boolean sToolkitInitialTouchBoostFlagValue = toolkitInitialTouchBoost();

    private static final boolean sToolkitInitialTouchBoostFlagValue = toolkitInitialTouchBoost();

    private static boolean sToolkitFrameRateDebugFlagValue =  toolkitFrameRateDebug();

    private static boolean sToolkitFrameRateDebugFlagValue =  toolkitFrameRateDebug();
@@ -4505,7 +4503,7 @@ public final class ViewRootImpl implements ViewParent, 
            }

            }

















            mDrawnThisFrame = false;







            mDrawnThisFrame = false;











            if (!mInvalidationIdleMessagePosted && sSurfaceFlingerBugfixFlagValue) {







            if (!mInvalidationIdleMessagePosted) {











                mInvalidationIdleMessagePosted = true;







                mInvalidationIdleMessagePosted = true;











                mHandler.sendEmptyMessageDelayed(MSG_CHECK_INVALIDATION_IDLE, IDLE_TIME_MILLIS);







                mHandler.sendEmptyMessageDelayed(MSG_CHECK_INVALIDATION_IDLE, IDLE_TIME_MILLIS);











            }







            }










@@ -13358,8 +13356,7 @@ public final class ViewRootImpl implements ViewParent,









     */







     */











    public void removeThreadedRendererView(View view) {







    public void removeThreadedRendererView(View view) {











        mThreadedRendererViews.remove(view);







        mThreadedRendererViews.remove(view);











        if (shouldEnableDvrr()







        if (shouldEnableDvrr() && !mInvalidationIdleMessagePosted) {











                && !mInvalidationIdleMessagePosted && sSurfaceFlingerBugfixFlagValue) {














            mInvalidationIdleMessagePosted = true;







            mInvalidationIdleMessagePosted = true;











            mHandler.sendEmptyMessageDelayed(MSG_CHECK_INVALIDATION_IDLE, IDLE_TIME_MILLIS);







            mHandler.sendEmptyMessageDelayed(MSG_CHECK_INVALIDATION_IDLE, IDLE_TIME_MILLIS);











        }







        }










@@ -13590,7 +13587,7 @@ public final class ViewRootImpl implements ViewParent,









        mHandler.removeMessages(MSG_TOUCH_BOOST_TIMEOUT);







        mHandler.removeMessages(MSG_TOUCH_BOOST_TIMEOUT);











        mHandler.removeMessages(MSG_FRAME_RATE_SETTING);







        mHandler.removeMessages(MSG_FRAME_RATE_SETTING);











        mHandler.removeMessages(MSG_SURFACE_REPLACED_TIMEOUT);







        mHandler.removeMessages(MSG_SURFACE_REPLACED_TIMEOUT);











        if (mInvalidationIdleMessagePosted && sSurfaceFlingerBugfixFlagValue) {







        if (mInvalidationIdleMessagePosted) {











            mInvalidationIdleMessagePosted = false;







            mInvalidationIdleMessagePosted = false;











            mHandler.removeMessages(MSG_CHECK_INVALIDATION_IDLE);







            mHandler.removeMessages(MSG_CHECK_INVALIDATION_IDLE);











        }







        }

























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



+4
−8




























Original line number
Original line
Diff line number
Diff line








@@ -1024,8 +1024,7 @@ public class ViewFrameRateTest {









    @LargeTest







    @LargeTest











    @Test







    @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,







            FLAG_TOOLKIT_FRAME_RATE_VIEW_ENABLING_READ_ONLY











            com.android.graphics.surfaceflinger.flags.Flags.FLAG_VRR_BUGFIX_24Q4














    })







    })











    public void idleDetected() throws Throwable {







    public void idleDetected() throws Throwable {











        if (!ViewProperties.vrr_enabled().orElse(true)) {







        if (!ViewProperties.vrr_enabled().orElse(true)) {









@@ -1051,8 +1050,7 @@ public class ViewFrameRateTest {









    @LargeTest







    @LargeTest











    @Test







    @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,







            FLAG_TOOLKIT_FRAME_RATE_VIEW_ENABLING_READ_ONLY











            com.android.graphics.surfaceflinger.flags.Flags.FLAG_VRR_BUGFIX_24Q4














    })







    })











    public void vectorDrawableFrameRate() throws Throwable {







    public void vectorDrawableFrameRate() throws Throwable {











        if (!ViewProperties.vrr_enabled().orElse(true)) {







        if (!ViewProperties.vrr_enabled().orElse(true)) {










@@ -1111,8 +1109,7 @@ public class ViewFrameRateTest {









    @LargeTest







    @LargeTest











    @Test







    @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,







            FLAG_TOOLKIT_FRAME_RATE_VIEW_ENABLING_READ_ONLY











            com.android.graphics.surfaceflinger.flags.Flags.FLAG_VRR_BUGFIX_24Q4














    })







    })











    public void renderNodeAnimatorFrameRateCanceled() throws Throwable {







    public void renderNodeAnimatorFrameRateCanceled() throws Throwable {











        if (!ViewProperties.vrr_enabled().orElse(true)) {







        if (!ViewProperties.vrr_enabled().orElse(true)) {










@@ -1151,8 +1148,7 @@ public class ViewFrameRateTest {









    @LargeTest







    @LargeTest











    @Test







    @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,







            FLAG_TOOLKIT_FRAME_RATE_VIEW_ENABLING_READ_ONLY











            com.android.graphics.surfaceflinger.flags.Flags.FLAG_VRR_BUGFIX_24Q4














    })







    })











    public void renderNodeAnimatorFrameRateRemoved() throws Throwable {







    public void renderNodeAnimatorFrameRateRemoved() throws Throwable {











        if (!ViewProperties.vrr_enabled().orElse(true)) {







        if (!ViewProperties.vrr_enabled().orElse(true)) {