diff options
| author | 2024-08-02 00:17:56 +0000 | |
|---|---|---|
| committer | 2024-08-02 00:17:56 +0000 | |
| commit | c60bb9c2f88526e858d2fbc5d9015bd82a17986d (patch) | |
| tree | b8f07d7e5098217d5e45651a9f1dcee8f6e0ce14 | |
| parent | d7ff0883a1344ec7527b3c0193decf284347e353 (diff) | |
| parent | eb7e53ba5bc3ed7f9f85749350b676aa182395e0 (diff) | |
Merge "fix "Comparison method violates its general contract!" IllegalArgumentException When the difference between the elapsedRealtime() values of two Entries exceeds the maximum size of an integer, casting the long result to an integer will cause an overflow." into main am: 4175c64b90 am: eb7e53ba5b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3201410
Change-Id: I27ecce741fd19ba5bd9021d97e274807315caff0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/java/android/view/SurfaceControlRegistry.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/view/SurfaceControlRegistry.java b/core/java/android/view/SurfaceControlRegistry.java index a806bd226c36..121c01be7294 100644 --- a/core/java/android/view/SurfaceControlRegistry.java +++ b/core/java/android/view/SurfaceControlRegistry.java @@ -73,7 +73,7 @@ public class SurfaceControlRegistry { } // Sort entries by time registered when dumping // TODO: Or should it sort by name? - entries.sort((o1, o2) -> (int) (o1.getValue() - o2.getValue())); + entries.sort((o1, o2) -> Long.compare(o1.getValue(), o2.getValue())); final int size = Math.min(entries.size(), limit); pw.println("SurfaceControlRegistry"); |