diff --git a/core/api/current.txt b/core/api/current.txt index 6eb3ff88bec81..4106c3b4e32f0 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -21889,7 +21889,6 @@ 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 1a49b85403e44..de2c56afd6d9f 100644 --- a/media/java/android/media/MediaFormat.java +++ b/media/java/android/media/MediaFormat.java @@ -480,6 +480,8 @@ public final class MediaFormat { *