diff options
| -rw-r--r-- | api/current.txt | 19 | ||||
| -rw-r--r-- | media/java/android/media/MediaItem2.java | 4 |
2 files changed, 20 insertions, 3 deletions
diff --git a/api/current.txt b/api/current.txt index fad607ccefec..d13843502802 100644 --- a/api/current.txt +++ b/api/current.txt @@ -24939,6 +24939,25 @@ package android.media { field public static final int TYPE_STRING = 4; // 0x4 } + public final class MediaItem2 implements android.os.Parcelable { + method public int describeContents(); + method public long getEndPosition(); + method public android.media.MediaMetadata getMetadata(); + method public long getStartPosition(); + method public void setMetadata(android.media.MediaMetadata); + method public void writeToParcel(android.os.Parcel, int); + field public static final android.os.Parcelable.Creator<android.media.MediaItem2> CREATOR; + field public static final long POSITION_UNKNOWN = 576460752303423487L; // 0x7ffffffffffffffL + } + + public static class MediaItem2.Builder { + ctor public MediaItem2.Builder(); + method public android.media.MediaItem2 build(); + method public android.media.MediaItem2.Builder setEndPosition(long); + method public android.media.MediaItem2.Builder setMetadata(android.media.MediaMetadata); + method public android.media.MediaItem2.Builder setStartPosition(long); + } + public final class MediaMetadata implements android.os.Parcelable { method public boolean containsKey(java.lang.String); method public int describeContents(); diff --git a/media/java/android/media/MediaItem2.java b/media/java/android/media/MediaItem2.java index 235325ebaf06..c496cf75995e 100644 --- a/media/java/android/media/MediaItem2.java +++ b/media/java/android/media/MediaItem2.java @@ -40,9 +40,8 @@ import java.util.concurrent.Executor; * <a href="{@docRoot}reference/androidx/media2/package-summary.html">Media2 Library</a> * for consistent behavior across all devices. * <p> - * @hide */ -public class MediaItem2 implements Parcelable { +public final class MediaItem2 implements Parcelable { private static final String TAG = "MediaItem2"; // intentionally less than long.MAX_VALUE. @@ -69,7 +68,6 @@ public class MediaItem2 implements Parcelable { } }; - // TODO: Use SessionPlayer2.UNKNOWN_TIME instead private static final long UNKNOWN_TIME = -1; private final long mStartPositionMs; |