Merge "Fix ravenwood test" into main

1 files changed, 5 insertions, 0 deletions

diff --git a/core/java/android/os/PerfettoTrackEventExtra.java b/core/java/android/os/PerfettoTrackEventExtra.java
index 8a3a5be9c934..07b44a87ef88 100644
--- a/core/java/android/os/PerfettoTrackEventExtra.java
+++ b/core/java/android/os/PerfettoTrackEventExtra.java
@@ -674,6 +674,7 @@ public final class PerfettoTrackEventExtra {
     /**
      * Resets the track event extra.
      */
+    @android.ravenwood.annotation.RavenwoodReplace
     public void reset() {
         native_clear_args(mPtr);
         mPendingPointers.clear();
@@ -1303,4 +1304,8 @@ public final class PerfettoTrackEventExtra {
         // Tracing currently completely disabled under Ravenwood
         return null;
     }
+
+    private void reset$ravenwood() {
+        // Tracing currently completely disabled under Ravenwood
+    }
 }