From d641efeb18033fd8b0182b33cb46e67261c2df5b Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Sat, 5 Jun 2021 16:32:10 +0000
Subject: [PATCH] Revert "Hide  MediaFormat#KEY_SLOW_MOTION_MARKERS"

This reverts commit fc0dd526c9d7ead8cc76345c5f96f7cd22750bc8.

Reason for revert: b/190241620
Bug: 190241620

Change-Id: I4f39a6d3e875dd261f24105c5e01033b597d88d3
---
 core/api/current.txt                      | 1 +
 media/java/android/media/MediaFormat.java | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/core/api/current.txt b/core/api/current.txt
index 4106c3b4e32f0..6eb3ff88bec81 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -21889,6 +21889,7 @@ package android.media {
     field public static final String KEY_ROTATION = "rotation-degrees";
     field public static final String KEY_SAMPLE_RATE = "sample-rate";
     field public static final String KEY_SLICE_HEIGHT = "slice-height";
+    field public static final String KEY_SLOW_MOTION_MARKERS = "slow-motion-markers";
     field public static final String KEY_STRIDE = "stride";
     field public static final String KEY_TEMPORAL_LAYERING = "ts-schema";
     field public static final String KEY_TILE_HEIGHT = "tile-height";
diff --git a/media/java/android/media/MediaFormat.java b/media/java/android/media/MediaFormat.java
index de2c56afd6d9f..1a49b85403e44 100644
--- a/media/java/android/media/MediaFormat.java
+++ b/media/java/android/media/MediaFormat.java
@@ -480,8 +480,6 @@ public final class MediaFormat {
      * <li>The timestampUs shall be monotonically increasing.</li>
      * <li>The timestampUs shall fall within the time span of the video track.</li>
      * <li>The first timestampUs should match that of the first video sample.</li>
-     *
-     * @hide
      */
     public static final String KEY_SLOW_MOTION_MARKERS = "slow-motion-markers";