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

Commit e965e05a authored by Rupesh Bansal's avatar Rupesh Bansal
Browse files

Removed vsync offset check from display info equality 

We recently added a mechanism for emitting refresh rate events when framerate is overridden. However, when framerate overridding happens, appVsyncOffsetNanos is also changed which is used to validate the displayInfo equality. This led to emission of both display changed and refresh rate changed events. https://android-build.corp.google.com/abtd/run/L57400030009232963/ was used to validate the metrics fix with the suggested changes

Bug: 387962667
Test: Manual testing
Flag: EXEMPT trivial change
Change-Id: I114a9958831f12cbf2492e6ebf3fc7302b7ae1e5
parent e69156bf

core/java/android/view/DisplayInfo.java

+2 −2
Original line number Diff line number Diff line
@@ -493,8 +493,6 @@ public final class DisplayInfo implements Parcelable { 
                && logicalDensityDpi == other.logicalDensityDpi

                && physicalXDpi == other.physicalXDpi

                && physicalYDpi == other.physicalYDpi

                && appVsyncOffsetNanos == other.appVsyncOffsetNanos

                && presentationDeadlineNanos == other.presentationDeadlineNanos

                && state == other.state

                && committedState == other.committedState

                && ownerUid == other.ownerUid
@@ -517,6 +515,8 @@ public final class DisplayInfo implements Parcelable { 
        if (compareRefreshRate) {

            return isEqualWithoutRefreshRate

                    && (getRefreshRate() == other.getRefreshRate())

                    && appVsyncOffsetNanos == other.appVsyncOffsetNanos

                    && presentationDeadlineNanos == other.presentationDeadlineNanos

                    && (modeId == other.modeId);

        }

        return isEqualWithoutRefreshRate;