From cc9c6441069c39a6ce9353b3a4861d470e3b18b0 Mon Sep 17 00:00:00 2001
From: Rachel Lee <rnlee@google.com>
Date: Wed, 19 Jan 2022 15:33:47 -0800
Subject: [PATCH] Fix negative frame time nanos.

On scheduling delays, frame time nanos changes.

Bug: 215299245
Bug: 198191703
Test: atest ChoreographerTest
Change-Id: Ia813971380276a93e0feabc3705dbe7515cc24ae
---
 core/java/android/view/Choreographer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/java/android/view/Choreographer.java b/core/java/android/view/Choreographer.java
index 9b8523f9b0061..b8eb6027b09c0 100644
--- a/core/java/android/view/Choreographer.java
+++ b/core/java/android/view/Choreographer.java
@@ -779,7 +779,7 @@ public final class Choreographer {
                                 + "time to " + (lastFrameOffset * 0.000001f) + " ms in the past.");
                     }
                     frameTimeNanos = startNanos - lastFrameOffset;
-                    frameData.setFrameTimeNanos(-lastFrameOffset);
+                    frameData.setFrameTimeNanos(frameTimeNanos);
                 }
 
                 if (frameTimeNanos < mLastFrameTimeNanos) {