From 6874dc63a90ee63fa88b9d4990fcdcefb88d08d7 Mon Sep 17 00:00:00 2001
From: Pascal Mütschard <pmuetschard@google.com>
Date: Mon, 27 Jan 2025 16:19:13 +0100
Subject: Mark SfVsyncFrameCallbackProvider as deprecated.

Also marks the underlying Choreographer#getSfInstance as deprecated.

Bug: b/222698397
Test: n/a
Flag: EXEMPT only adding deprecation warning
Change-Id: I20e253f10458ebc985c622fb9555f26e7eda38ce
---
 core/java/android/view/Choreographer.java                             | 2 ++
 .../com/android/internal/graphics/SfVsyncFrameCallbackProvider.java   | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/java/android/view/Choreographer.java b/core/java/android/view/Choreographer.java
index 053ccdd73c8c..7c1e4976b9d3 100644
--- a/core/java/android/view/Choreographer.java
+++ b/core/java/android/view/Choreographer.java
@@ -372,8 +372,10 @@ public final class Choreographer {
 
     /**
      * @hide
+     * @deprecated Use vsync IDs with the regular Choreographer instead.
      */
     @UnsupportedAppUsage
+    @Deprecated
     public static Choreographer getSfInstance() {
         return sSfThreadInstance.get();
     }
diff --git a/core/java/com/android/internal/graphics/SfVsyncFrameCallbackProvider.java b/core/java/com/android/internal/graphics/SfVsyncFrameCallbackProvider.java
index dbbe4b9675d7..0b04477657d3 100644
--- a/core/java/com/android/internal/graphics/SfVsyncFrameCallbackProvider.java
+++ b/core/java/com/android/internal/graphics/SfVsyncFrameCallbackProvider.java
@@ -23,8 +23,10 @@ import android.view.Choreographer;
  * Provider of timing pulse that uses SurfaceFlinger Vsync Choreographer for frame callbacks.
  *
  * @hide
+ * @deprecated See b/222698397 - use vsync IDs instead.
  */
 // TODO(b/222698397): remove getSfInstance/this class usage and use vsyncId for transactions
+@Deprecated
 public final class SfVsyncFrameCallbackProvider implements AnimationFrameCallbackProvider {
 
     private final Choreographer mChoreographer;
@@ -61,4 +63,4 @@ public final class SfVsyncFrameCallbackProvider implements AnimationFrameCallbac
     public void setFrameDelay(long delay) {
         Choreographer.setFrameDelay(delay);
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3-59-g8ed1b