Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 30635a95 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Unhide MediaItem2"

parents da74280f d922e0d6

api/current.txt

+19 −0
Original line number Diff line number Diff line
@@ -24942,6 +24942,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();

























media/java/android/media/MediaItem2.java



+1
−3




























Original line number
Diff line number
Diff line








@@ -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;