summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2022-06-30 04:23:05 -0700
committerLinux Build Service Account <lnxbuild@localhost>2022-06-30 04:23:05 -0700
commitb7042aa76a7bb60b9dd2a44a4558bb631f44cc5e (patch)
tree9152f2d2c3bae1fdf187f8b90b7896bbfd6e2aa5 /core
parente1627f5362f7239a0e920876621300c564e35cbf (diff)
parentd9b68a9f5b630d57a37a789034a6f5ca78e0d8fb (diff)
Merge d9b68a9f5b630d57a37a789034a6f5ca78e0d8fb on remote branch
Change-Id: Ic20032d2fcdc7c0864d145907b633ca59a212968
Diffstat (limited to 'core')
-rw-r--r--core/java/android/view/Choreographer.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/view/Choreographer.java b/core/java/android/view/Choreographer.java
index 39beeeae11de..c3511e7c036d 100644
--- a/core/java/android/view/Choreographer.java
+++ b/core/java/android/view/Choreographer.java
@@ -844,6 +844,10 @@ public final class Choreographer {
mLastVsyncEventData = vsyncEventData;
}
+ if (frameIntervalNanos > 0 && frameIntervalNanos != mFrameIntervalNanos) {
+ mFrameIntervalNanos = frameIntervalNanos;
+ ScrollOptimizer.setFrameInterval(mFrameIntervalNanos);
+ }
ScrollOptimizer.setUITaskStatus(true);
AnimationUtils.lockAnimationClock(frameTimeNanos / TimeUtils.NANOS_PER_MS);