commit 747e105af135b4480ef668e55e86d7a116a90c8f
author android-build-team Robot <android-build-team-robot@google.com> Wed Apr 21 22:31:37 2021 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Wed Apr 21 22:31:37 2021 +0000
tree 9e1a3d30b39c2c7ab4f6ff97be6aec9c808d4b89
parent bb6d92503e5670abf4e95c0346c478a99e0bd5fb
parent 014d2d7a1131fad54ef0c09cb91ceb069a70afb6

Snap for 7302986 from 014d2d7a1131fad54ef0c09cb91ceb069a70afb6 to sc-mainline-release

Change-Id: I60c88b57f3f312391cfbddfd44fddc253fe3524e

Android.bp

diff --git a/Android.bp b/Android.bp
index 1df6316..048b78e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -54,8 +54,8 @@
     out: ["temp_layoutlib.jar"],
     srcs: [
         ":atf-prebuilt{.jar}",
-        ":core-icu4j{.jar}",
-        ":core-libart{.jar}",
+        ":core-icu4j-for-host{.jar}",
+        ":core-libart-for-host{.jar}",
         ":framework-all{.jar}",
         ":ext{.jar}",
         ":icu4j-icudata-jarjar{.jar}", // HOST

bridge/src/android/view/Choreographer_Delegate.java

diff --git a/bridge/src/android/view/Choreographer_Delegate.java b/bridge/src/android/view/Choreographer_Delegate.java
index 1dc7778..3a8839f 100644
--- a/bridge/src/android/view/Choreographer_Delegate.java
+++ b/bridge/src/android/view/Choreographer_Delegate.java
@@ -33,6 +33,8 @@
 public class Choreographer_Delegate {
     private static final AtomicReference<Choreographer> mInstance = new AtomicReference<Choreographer>();
 
+    private static final int MS_16 = 16000000;
+
     @LayoutlibDelegate
     public static Choreographer getInstance() {
         if (mInstance.get() == null) {
@@ -60,15 +62,15 @@
         try {
             thisChoreographer.mLastFrameTimeNanos = frameTimeNanos - thisChoreographer.getFrameIntervalNanos();
             thisChoreographer.mFrameInfo.markInputHandlingStart();
-            thisChoreographer.doCallbacks(Choreographer.CALLBACK_INPUT, frameTimeNanos);
+            thisChoreographer.doCallbacks(Choreographer.CALLBACK_INPUT, frameTimeNanos, MS_16);
 
             thisChoreographer.mFrameInfo.markAnimationsStart();
-            thisChoreographer.doCallbacks(Choreographer.CALLBACK_ANIMATION, frameTimeNanos);
+            thisChoreographer.doCallbacks(Choreographer.CALLBACK_ANIMATION, frameTimeNanos, MS_16);
 
             thisChoreographer.mFrameInfo.markPerformTraversalsStart();
-            thisChoreographer.doCallbacks(Choreographer.CALLBACK_TRAVERSAL, frameTimeNanos);
+            thisChoreographer.doCallbacks(Choreographer.CALLBACK_TRAVERSAL, frameTimeNanos, MS_16);
 
-            thisChoreographer.doCallbacks(Choreographer.CALLBACK_COMMIT, frameTimeNanos);
+            thisChoreographer.doCallbacks(Choreographer.CALLBACK_COMMIT, frameTimeNanos, MS_16);
         } finally {
             AnimationUtils.unlockAnimationClock();
         }