Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Handle when AnimationUtils getExpectedPresentationTimeNanos is not called in a callback" into main

Browse Source
This commit is contained in:
Jian-Syuan (Shane) Wong
2023-07-19 17:18:03 +00:00
committed by Android (Google) Code Review
parent 78add90670 444cb5e4f0
commit c4c0ca1eba
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/view/animation/AnimationUtils.java
View File

@@ -32,6 +32,7 @@ import android.os.SystemClock;
import android.util.AttributeSet;
import android.util.TimeUtils;
import android.util.Xml;
import android.view.Choreographer;
import android.view.InflateException;
import org.xmlpull.v1.XmlPullParser;
@@ -153,7 +154,13 @@ public class AnimationUtils {
*/
public static long getExpectedPresentationTimeNanos() {
AnimationState state = sAnimationState.get();
return state.mExpectedPresentationTimeNanos;
if (state.animationClockLocked) {
return state.mExpectedPresentationTimeNanos;
}
// When this methoed is called outside of a Choreographer callback,
// we obtain the value of expectedPresentTimeNanos from the Choreographer.
// This helps avoid returning a time that could potentially be earlier than current time.
return Choreographer.getInstance().getLatestExpectedPresentTimeNanos();
}
/**