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

Commit 152bbe04 authored by Rupesh Bansal's avatar Rupesh Bansal Committed by Android (Google) Code Review
Browse files

Merge "Removed vsync offset check from display info equality" into main

parents b97e83fb e965e05a

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;