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

Commit 8eff9f67 authored by Shane's avatar Shane
Browse files

Add flags to the API changes in AnimationUtils and Choreographer 

Add flags to gate the API changed made before the Trunk Stable flag is
ready to use.

Test: atest AnimationUtilsTest / atest ChoreographerTest
Bug: 301713352
Change-Id: Ide4d03a29830897f0cb3f62a703b48ad6e76804d
parent e33451a3

core/api/test-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -3408,7 +3408,7 @@ package android.view { 


  public final class Choreographer {

    method public static long getFrameDelay();

    method public long getFrameTimeNanos();

    method @FlaggedApi("android.view.flags.expected_presentation_time_api") public long getFrameTimeNanos();

    method public void postCallback(int, Runnable, Object);

    method public void postCallbackDelayed(int, Runnable, Object, long);

    method public void removeCallbacks(int, Runnable, Object);
@@ -3627,7 +3627,7 @@ package android.view.accessibility { 
package android.view.animation {



  public class AnimationUtils {

    method public static void lockAnimationClock(long, long);

    method @FlaggedApi("android.view.flags.expected_presentation_time_api") public static void lockAnimationClock(long, long);

    method public static void unlockAnimationClock();

  }

core/java/android/view/Choreographer.java

+3 −0
Original line number Diff line number Diff line
@@ -16,9 +16,11 @@ 


package android.view;



import static android.view.flags.Flags.FLAG_EXPECTED_PRESENTATION_TIME_API;

import static android.view.DisplayEventReceiver.VSYNC_SOURCE_APP;

import static android.view.DisplayEventReceiver.VSYNC_SOURCE_SURFACE_FLINGER;



import android.annotation.FlaggedApi;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.SuppressLint;
@@ -695,6 +697,7 @@ public final class Choreographer { 
     */

    @TestApi

    @UnsupportedAppUsage

    @FlaggedApi(FLAG_EXPECTED_PRESENTATION_TIME_API)

    public long getFrameTimeNanos() {

        synchronized (mLock) {

            if (!mCallbacksRunning) {

core/java/android/view/animation/AnimationUtils.java

+4 −1
Original line number Diff line number Diff line
@@ -108,12 +108,15 @@ public class AnimationUtils { 
     * @hide

     */

    @TestApi

    @FlaggedApi(FLAG_EXPECTED_PRESENTATION_TIME_API)

    public static void lockAnimationClock(long vsyncMillis, long expectedPresentationTimeNanos) {

        AnimationState state = sAnimationState.get();

        state.animationClockLocked = true;

        state.currentVsyncTimeMillis = vsyncMillis;

        if (!expectedPresentationTimeApi()) {

            state.mExpectedPresentationTimeNanos = expectedPresentationTimeNanos;

        }

    }



    /**

     * Frees the time lock set in place by {@link #lockAnimationClock(long)}. Must be called