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

Commit 1cb7ea16 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix modulo div by 0 in Choreographer." into tm-dev am: 6dadf45f 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18718035



Change-Id: I87dfecf9f009fb7733e592c9da77ec24ecee2496
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 149ad93c 6dadf45f

core/java/android/view/Choreographer.java

+2 −1
Original line number Diff line number Diff line
@@ -765,10 +765,11 @@ public final class Choreographer { 
                startNanos = System.nanoTime();

                final long jitterNanos = startNanos - frameTimeNanos;

                if (jitterNanos >= frameIntervalNanos) {

                    final long lastFrameOffset = jitterNanos % frameIntervalNanos;

                    long lastFrameOffset = 0;

                    if (frameIntervalNanos == 0) {

                        Log.i(TAG, "Vsync data empty due to timeout");

                    } else {

                        lastFrameOffset = jitterNanos % frameIntervalNanos;

                        final long skippedFrames = jitterNanos / frameIntervalNanos;

                        if (skippedFrames >= SKIPPED_FRAME_WARNING_LIMIT) {

                            Log.i(TAG, "Skipped " + skippedFrames + " frames!  "