commit 152bbe043bf20889d7ecfdeeb8a4b0f7c68000b6
author Rupesh Bansal <brup@google.com> Tue Feb 04 03:55:24 2025 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 04 03:55:24 2025 -0800
tree c44d5b5ba513bb6c3bc35237426088ab7ca8718b
parent b97e83fb12d1cb21d019cf7125e093f59128165d
parent e965e05a7fa0d836aaed34963d75409f69d97490

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

core/java/android/view/DisplayInfo.java

diff --git a/core/java/android/view/DisplayInfo.java b/core/java/android/view/DisplayInfo.java
index e75b1b0..ecdbaa3 100644
--- a/core/java/android/view/DisplayInfo.java
+++ b/core/java/android/view/DisplayInfo.java
@@ -493,8 +493,6 @@
                 && 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 @@
         if (compareRefreshRate) {
             return isEqualWithoutRefreshRate
                     && (getRefreshRate() == other.getRefreshRate())
+                    && appVsyncOffsetNanos == other.appVsyncOffsetNanos
+                    && presentationDeadlineNanos == other.presentationDeadlineNanos
                     && (modeId == other.modeId);
         }
         return isEqualWithoutRefreshRate;