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

Commit 9512dc28 authored by Oleg Petšjonkin's avatar Oleg Petšjonkin Committed by Android (Google) Code Review
Browse files

Merge "Using SupportModesVote in Display.Mode calculation" into main

parents 874588fc 53ae1215

services/core/java/com/android/server/display/feature/DisplayManagerFlags.java

+1 −1
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ public class DisplayManagerFlags { 
        return mBrightnessIntRangeUserPerceptionFlagState.isEnabled();

    }



    public boolean isExternalVsyncProximityVoteEnabled() {

    public boolean isVsyncProximityVoteEnabled() {

        return mVsyncProximityVote.isEnabled();

    }

services/core/java/com/android/server/display/mode/BaseModeRefreshRateVote.java

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ class BaseModeRefreshRateVote implements Vote { 
    }



    @Override

    public void updateSummary(DisplayModeDirector.VoteSummary summary) {

    public void updateSummary(VoteSummary summary) {

        if (summary.appRequestBaseModeRefreshRate == 0f

                && mAppRequestBaseModeRefreshRate > 0f) {

            summary.appRequestBaseModeRefreshRate = mAppRequestBaseModeRefreshRate;

services/core/java/com/android/server/display/mode/CombinedVote.java

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ class CombinedVote implements Vote { 
    }



    @Override

    public void updateSummary(DisplayModeDirector.VoteSummary summary) {

    public void updateSummary(VoteSummary summary) {

        mVotes.forEach(vote -> vote.updateSummary(summary));

    }

services/core/java/com/android/server/display/mode/DisableRefreshRateSwitchingVote.java

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ class DisableRefreshRateSwitchingVote implements Vote { 
    }



    @Override

    public void updateSummary(DisplayModeDirector.VoteSummary summary) {

    public void updateSummary(VoteSummary summary) {

        summary.disableRefreshRateSwitching =

                summary.disableRefreshRateSwitching || mDisableRefreshRateSwitching;

    }

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

+27 −345

File changed.

Preview size limit exceeded, changes collapsed.