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

Commit 42193cbc authored by Ady Abraham's avatar Ady Abraham
Browse files

Adding publicAlternatives to UnsupportedAppUsage on Choreographer 

Adding back the UnsupportedAppUsage annotation together with
publicAlternatives according to
https://googleplex-android-review.git.corp.google.com/c/platform/frameworks/base/+/12517216/11/core/java/android/view/DisplayEventReceiver.java#158

Test: build
Bug: 162890382
Bug: 162888881
Bug: 162890407
Change-Id: I7b895978ec61290c5320ccb2472b0bf1addc914b
parent 485fce2a

core/java/android/view/Choreographer.java

+2 −0
Original line number Diff line number Diff line
@@ -660,6 +660,8 @@ public final class Choreographer { 
        ThreadedRenderer.setFPSDivisor(divisor);

    }



    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, publicAlternatives = "Use {@link "

            + "#postFrameCallback} instead")

    void doFrame(long frameTimeNanos, int frame, long frameTimelineVsyncId) {

        final long startNanos;

        synchronized (mLock) {

core/java/android/view/DisplayEventReceiver.java

+5 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package android.view;



import android.compat.annotation.UnsupportedAppUsage;

import android.os.Build;

import android.os.Looper;

import android.os.MessageQueue;

import android.util.Log;
@@ -157,6 +158,8 @@ public abstract class DisplayEventReceiver { 
     * @param frameTimelineVsyncId The frame timeline vsync id, used to correlate a frame

     * produced by HWUI with the timeline data stored in Surface Flinger.

     */

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, publicAlternatives = "Use {@link "

            + "Choreographer#postFrameCallback} instead")

    public void onVsync(long timestampNanos, long physicalDisplayId, int frame,

            long frameTimelineVsyncId) {

    }
@@ -200,6 +203,8 @@ public abstract class DisplayEventReceiver { 


    // Called from native code.

    @SuppressWarnings("unused")

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, publicAlternatives = "Use {@link "

            + "Choreographer#postFrameCallback} instead")

    private void dispatchVsync(long timestampNanos, long physicalDisplayId, int frame,

            long frameTimelineVsyncId) {

        onVsync(timestampNanos, physicalDisplayId, frame, frameTimelineVsyncId);