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

Commit 75e1b6a0 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "DisplayModeDirector: initialize min/max refresh rate" into rvc-dev am: c11267f3 

Change-Id: I8d7673317a1097f67c72dfa89b2b09c460b8845a
parents ac696803 c11267f3

services/core/java/com/android/server/display/DisplayModeDirector.java

+2 −0
Original line number Diff line number Diff line
@@ -178,6 +178,8 @@ public class DisplayModeDirector { 
            float maxRefreshRate = Float.POSITIVE_INFINITY;

            int lowestConsideredPriority = Vote.MIN_PRIORITY;

            while (lowestConsideredPriority <= Vote.MAX_PRIORITY) {

                minRefreshRate = 0f;

                maxRefreshRate = Float.POSITIVE_INFINITY;

                int height = Vote.INVALID_SIZE;

                int width = Vote.INVALID_SIZE;

services/tests/servicestests/src/com/android/server/display/DisplayModeDirectorTest.java

+45 −0
Original line number Diff line number Diff line
@@ -144,4 +144,49 @@ public class DisplayModeDirectorTest { 
        Truth.assertThat(desiredSpecs.refreshRateRange.max).isWithin(FLOAT_TOLERANCE).of(60);

        Truth.assertThat(desiredSpecs.baseModeId).isEqualTo(60);

    }



    @Test

    public void testBrightnessHasLowerPriorityThanUser() {

        assertTrue(Vote.PRIORITY_LOW_BRIGHTNESS < Vote.PRIORITY_APP_REQUEST_REFRESH_RATE);

        assertTrue(Vote.PRIORITY_LOW_BRIGHTNESS < Vote.PRIORITY_APP_REQUEST_SIZE);



        int displayId = 0;

        DisplayModeDirector director = createDisplayModeDirectorWithDisplayFpsRange(60, 90);

        SparseArray<Vote> votes = new SparseArray<>();

        SparseArray<SparseArray<Vote>> votesByDisplay = new SparseArray<>();

        votesByDisplay.put(displayId, votes);

        votes.put(Vote.PRIORITY_APP_REQUEST_REFRESH_RATE, Vote.forRefreshRates(60, 90));

        votes.put(Vote.PRIORITY_LOW_BRIGHTNESS, Vote.forRefreshRates(60, 60));

        director.injectVotesByDisplay(votesByDisplay);

        DesiredDisplayModeSpecs desiredSpecs = director.getDesiredDisplayModeSpecs(displayId);

        Truth.assertThat(desiredSpecs.refreshRateRange.min).isWithin(FLOAT_TOLERANCE).of(60);

        Truth.assertThat(desiredSpecs.refreshRateRange.max).isWithin(FLOAT_TOLERANCE).of(60);



        votes.clear();

        votes.put(Vote.PRIORITY_APP_REQUEST_REFRESH_RATE, Vote.forRefreshRates(60, 90));

        votes.put(Vote.PRIORITY_LOW_BRIGHTNESS, Vote.forRefreshRates(90, 90));

        director.injectVotesByDisplay(votesByDisplay);

        desiredSpecs = director.getDesiredDisplayModeSpecs(displayId);

        Truth.assertThat(desiredSpecs.refreshRateRange.min).isWithin(FLOAT_TOLERANCE).of(90);

        Truth.assertThat(desiredSpecs.refreshRateRange.max).isWithin(FLOAT_TOLERANCE).of(90);





        votes.clear();

        votes.put(Vote.PRIORITY_APP_REQUEST_REFRESH_RATE, Vote.forRefreshRates(90, 90));

        votes.put(Vote.PRIORITY_LOW_BRIGHTNESS, Vote.forRefreshRates(60, 60));

        director.injectVotesByDisplay(votesByDisplay);

        desiredSpecs = director.getDesiredDisplayModeSpecs(displayId);

        Truth.assertThat(desiredSpecs.refreshRateRange.min).isWithin(FLOAT_TOLERANCE).of(90);

        Truth.assertThat(desiredSpecs.refreshRateRange.max).isWithin(FLOAT_TOLERANCE).of(90);



        votes.clear();

        votes.put(Vote.PRIORITY_APP_REQUEST_REFRESH_RATE, Vote.forRefreshRates(60, 60));

        votes.put(Vote.PRIORITY_LOW_BRIGHTNESS, Vote.forRefreshRates(90, 90));

        director.injectVotesByDisplay(votesByDisplay);

        desiredSpecs = director.getDesiredDisplayModeSpecs(displayId);

        Truth.assertThat(desiredSpecs.refreshRateRange.min).isWithin(FLOAT_TOLERANCE).of(60);

        Truth.assertThat(desiredSpecs.refreshRateRange.max).isWithin(FLOAT_TOLERANCE).of(60);





    }

}