summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Matthew Duggan <mduggan@google.com> 2023-08-24 06:04:01 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2023-08-24 06:04:01 +0000
commit26c1ac15c084b05b80d315a51a19a2397294e543 (patch)
tree930d857f43e41c6c0cfbf137208bbc39f1ef814b
parentab6e676570be94baf91a9c8863001111ce80bcef (diff)
parent8976072bbc221a552158a2110015f594402a30ac (diff)
Merge "Avoid modulo div by 0 in Choreographer." into main
-rw-r--r--core/java/android/view/Choreographer.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/view/Choreographer.java b/core/java/android/view/Choreographer.java
index ca33c5e05944..f1458fa11770 100644
--- a/core/java/android/view/Choreographer.java
+++ b/core/java/android/view/Choreographer.java
@@ -977,7 +977,7 @@ public final class Choreographer {
if (callbackType == Choreographer.CALLBACK_COMMIT) {
final long jitterNanos = now - frameTimeNanos;
Trace.traceCounter(Trace.TRACE_TAG_VIEW, "jitterNanos", (int) jitterNanos);
- if (jitterNanos >= 2 * frameIntervalNanos) {
+ if (frameIntervalNanos > 0 && jitterNanos >= 2 * frameIntervalNanos) {
final long lastFrameOffset = jitterNanos % frameIntervalNanos
+ frameIntervalNanos;
if (DEBUG_JANK) {