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

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

Merge "Move MediaMetadata class back to framework"

parents b7c7d891 a17bf2d0

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -3659,7 +3659,7 @@ package android.media.session { 
  }















  public final class MediaSessionEngine implements java.lang.AutoCloseable {













    ctor public MediaSessionEngine(@NonNull android.content.Context, @NonNull android.media.session.SessionLink, @NonNull android.media.session.SessionCallbackLink, @NonNull android.media.session.MediaSessionEngine.CallbackStub, int);













    ctor public MediaSessionEngine(@NonNull android.content.Context, @NonNull android.media.session.SessionLink, @NonNull android.media.session.SessionCallbackLink, @NonNull android.media.session.MediaSessionEngine.CallbackStub);















    method public void close();















    method public String getCallingPackage();















    method @NonNull public android.media.session.MediaController getController();

































media/Android.bp



+0
−1




























Original line number
Diff line number
Diff line








@@ -66,7 +66,6 @@ filegroup {













filegroup {















    name: "media1-srcs",















    srcs: [













        "apex/java/android/media/MediaMetadata.java",















        "apex/java/android/media/MediaParceledListSlice.java",















        "apex/java/android/media/VolumeProvider.java",















        "apex/java/android/media/browse/MediaBrowser.java",

































media/apex/java/android/media/session/MediaSessionEngine.java



+1
−4




























Original line number
Diff line number
Diff line








@@ -56,7 +56,6 @@ public final class MediaSessionEngine implements AutoCloseable {













    private static final String TAG = "MediaSession";































    private final Object mLock = new Object();













    private final int mMaxBitmapSize;































    private final MediaSession.Token mSessionToken;















    private final MediaController mController;









@@ -82,10 +81,9 @@ public final class MediaSessionEngine implements AutoCloseable {













     * @param cbStub A callback link that handles incoming command to {@link MediaSession.Callback}.















     */















    public MediaSessionEngine(@NonNull Context context, @NonNull SessionLink sessionLink,













            @NonNull SessionCallbackLink cbLink, @NonNull CallbackStub cbStub, int maxBitmapSize) {













            @NonNull SessionCallbackLink cbLink, @NonNull CallbackStub cbStub) {















        mSessionLink = sessionLink;















        mCbLink = cbLink;













        mMaxBitmapSize = maxBitmapSize;































        cbStub.setSessionImpl(this);















        mSessionToken = new MediaSession.Token(mSessionLink.getController());










@@ -346,7 +344,6 @@ public final class MediaSessionEngine implements AutoCloseable {













        int fields = 0;















        MediaDescription description = null;















        if (metadata != null) {













            metadata = (new MediaMetadata.Builder(metadata, mMaxBitmapSize)).build();















            if (metadata.containsKey(MediaMetadata.METADATA_KEY_DURATION)) {















                duration = metadata.getLong(MediaMetadata.METADATA_KEY_DURATION);















            }