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

Commit 020b777f authored by Riddle Hsu's avatar Riddle Hsu
Browse files

Fix unit test when explicitRefreshRateHints is enabled 

Skip the assertions for the logic that are only used for
disabled explicitRefreshRateHints.

Bug: 309884210
Bug: 309884436
Test: RefreshRatePolicyTest
Change-Id: I342f05fed8574fc9f581d2f35d75399825deab54
parent f4356a7a

services/tests/wmtests/src/com/android/server/wm/RefreshRatePolicyTest.java

+10 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import static android.view.SurfaceControl.RefreshRateRange.FLOAT_TOLERANCE; 
import static android.view.WindowManager.LayoutParams.TYPE_BASE_APPLICATION;



import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_APP_TRANSITION;

import static com.android.window.flags.Flags.explicitRefreshRateHints;



import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertFalse;
@@ -282,6 +283,9 @@ public class RefreshRatePolicyTest extends WindowTestsBase { 
        assertEquals(0, mPolicy.getPreferredMinRefreshRate(overrideWindow), FLOAT_TOLERANCE);

        assertEquals(0, mPolicy.getPreferredMaxRefreshRate(overrideWindow), FLOAT_TOLERANCE);



        if (explicitRefreshRateHints()) {

            return;

        }

        overrideWindow.mActivityRecord.mSurfaceAnimator.startAnimation(

                overrideWindow.getPendingTransaction(), mock(AnimationAdapter.class),

                false /* hidden */, ANIMATION_TYPE_APP_TRANSITION);
@@ -320,6 +324,9 @@ public class RefreshRatePolicyTest extends WindowTestsBase { 
        assertEquals(0, mPolicy.getPreferredMinRefreshRate(overrideWindow), FLOAT_TOLERANCE);

        assertEquals(0, mPolicy.getPreferredMaxRefreshRate(overrideWindow), FLOAT_TOLERANCE);



        if (explicitRefreshRateHints()) {

            return;

        }

        overrideWindow.mActivityRecord.mSurfaceAnimator.startAnimation(

                overrideWindow.getPendingTransaction(), mock(AnimationAdapter.class),

                false /* hidden */, ANIMATION_TYPE_APP_TRANSITION);
@@ -342,6 +349,9 @@ public class RefreshRatePolicyTest extends WindowTestsBase { 
        assertEquals(0, mPolicy.getPreferredMinRefreshRate(window), FLOAT_TOLERANCE);

        assertEquals(0, mPolicy.getPreferredMaxRefreshRate(window), FLOAT_TOLERANCE);



        if (explicitRefreshRateHints()) {

            return;

        }

        window.mActivityRecord.mSurfaceAnimator.startAnimation(

                window.getPendingTransaction(), mock(AnimationAdapter.class),

                false /* hidden */, ANIMATION_TYPE_APP_TRANSITION);

services/tests/wmtests/src/com/android/server/wm/TransitionTests.java

+1 −0
Original line number Diff line number Diff line
@@ -2454,6 +2454,7 @@ public class TransitionTests extends WindowTestsBase { 
            spyOn(perfHinter);

            doAnswer(invocation -> {

                session[0] = (SystemPerformanceHinter.HighPerfSession) invocation.callRealMethod();

                spyOn(session[0]);

                return session[0];

            }).when(perfHinter).createSession(anyInt(), anyInt(), anyString());

        }