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

Commit f3744461 authored by Doris Liu's avatar Doris Liu Committed by Android (Google) Code Review
Browse files

Merge "Expose necessary methods/fields to CTS using testApi"

parents 639cc73b 197a6743

api/test-current.txt

+3 −0
Original line number Original line Diff line number Diff line
@@ -44478,10 +44478,13 @@ package android.view { 
  }

  }

















  public final class Choreographer {







  public final class Choreographer {














    method public static long getFrameDelay();











    method public static android.view.Choreographer getInstance();







    method public static android.view.Choreographer getInstance();











    method public void postFrameCallback(android.view.Choreographer.FrameCallback);







    method public void postFrameCallback(android.view.Choreographer.FrameCallback);











    method public void postFrameCallbackDelayed(android.view.Choreographer.FrameCallback, long);







    method public void postFrameCallbackDelayed(android.view.Choreographer.FrameCallback, long);











    method public void removeFrameCallback(android.view.Choreographer.FrameCallback);







    method public void removeFrameCallback(android.view.Choreographer.FrameCallback);














    method public static void setFrameDelay(long);














    field public static final int CALLBACK_ANIMATION = 1; // 0x1











  }







  }



























  public static abstract interface Choreographer.FrameCallback {







  public static abstract interface Choreographer.FrameCallback {

























core/java/android/view/Choreographer.java



+4
−0




























Original line number
Original line
Diff line number
Diff line








@@ -19,6 +19,7 @@ package android.view;









import static android.view.DisplayEventReceiver.VSYNC_SOURCE_APP;







import static android.view.DisplayEventReceiver.VSYNC_SOURCE_APP;











import static android.view.DisplayEventReceiver.VSYNC_SOURCE_SURFACE_FLINGER;







import static android.view.DisplayEventReceiver.VSYNC_SOURCE_SURFACE_FLINGER;


































import android.annotation.TestApi;











import android.hardware.display.DisplayManagerGlobal;







import android.hardware.display.DisplayManagerGlobal;











import android.os.Handler;







import android.os.Handler;











import android.os.Looper;







import android.os.Looper;










@@ -195,6 +196,7 @@ public final class Choreographer {









     * Callback type: Animation callback.  Runs before traversals.







     * Callback type: Animation callback.  Runs before traversals.











     * @hide







     * @hide











     */







     */














    @TestApi











    public static final int CALLBACK_ANIMATION = 1;







    public static final int CALLBACK_ANIMATION = 1;































    /**







    /**










@@ -286,6 +288,7 @@ public final class Choreographer {









     * @return the requested time between frames, in milliseconds







     * @return the requested time between frames, in milliseconds











     * @hide







     * @hide











     */







     */














    @TestApi











    public static long getFrameDelay() {







    public static long getFrameDelay() {











        return sFrameDelay;







        return sFrameDelay;











    }







    }









@@ -305,6 +308,7 @@ public final class Choreographer {









     * @param frameDelay the requested time between frames, in milliseconds







     * @param frameDelay the requested time between frames, in milliseconds











     * @hide







     * @hide











     */







     */














    @TestApi











    public static void setFrameDelay(long frameDelay) {







    public static void setFrameDelay(long frameDelay) {











        sFrameDelay = frameDelay;







        sFrameDelay = frameDelay;











    }







    }