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

Commit b016fa8b authored by Hyundo Moon's avatar Hyundo Moon Committed by Android (Google) Code Review
Browse files

Merge "Use MediaParceledListSlice in ControllerCallbackLink"

parents f71cb5ac 158e4a2d

media/java/android/media/session/ControllerCallbackLink.java

+5 −3
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.annotation.SystemApi; 
import android.content.Context;

import android.content.pm.PackageManager;

import android.media.MediaMetadata;

import android.media.MediaParceledListSlice;

import android.media.session.MediaController.PlaybackInfo;

import android.media.session.MediaSession.QueueItem;

import android.os.Binder;
@@ -127,7 +128,8 @@ public final class ControllerCallbackLink implements Parcelable { 
    @RequiresPermission(Manifest.permission.MEDIA_CONTENT_CONTROL)

    public void notifyQueueChanged(@Nullable List<QueueItem> queue) {

        try {

            mIControllerCallback.notifyQueueChanged(queue);

            mIControllerCallback.notifyQueueChanged(queue == null ? null :

                    new MediaParceledListSlice(queue));

        } catch (RemoteException e) {

            throw new RuntimeException(e);

        }
@@ -275,11 +277,11 @@ public final class ControllerCallbackLink implements Parcelable { 
        }



        @Override

        public void notifyQueueChanged(List<QueueItem> queue) {

        public void notifyQueueChanged(MediaParceledListSlice queue) {

            ensureMediaControlPermission();

            final long token = Binder.clearCallingIdentity();

            try {

                mCallbackStub.onQueueChanged(queue);

                mCallbackStub.onQueueChanged(queue == null ? null : queue.getList());

            } finally {

                Binder.restoreCallingIdentity(token);

            }

media/java/android/media/session/ISessionControllerCallback.aidl

+2 −2
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ 
package android.media.session;



import android.media.MediaMetadata;

import android.media.MediaParceledListSlice;

import android.media.session.MediaController;

import android.media.session.MediaSession;

import android.media.session.PlaybackState;

import android.os.Bundle;
@@ -31,7 +31,7 @@ oneway interface ISessionControllerCallback { 
    // These callbacks are for the TransportController

    void notifyPlaybackStateChanged(in PlaybackState state);

    void notifyMetadataChanged(in MediaMetadata metadata);

    void notifyQueueChanged(in List<MediaSession.QueueItem> queue);

    void notifyQueueChanged(in MediaParceledListSlice queue);

    void notifyQueueTitleChanged(CharSequence title);

    void notifyExtrasChanged(in Bundle extras);

    void notifyVolumeInfoChanged(in MediaController.PlaybackInfo info);