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

Commit 1fe914d9 authored by Jaewan Kim's avatar Jaewan Kim
Browse files

MediaSession2: Change MediaPlayerBase to MediaPlayerInterface 

Test: Run all MediaComponents tests once
Bug: 72527150
Change-Id: I3ad393507f6029b7b3aa2590dc637928faf16d8c
parent f6f272f8

packages/MediaComponents/src/com/android/media/MediaLibraryService2Impl.java

+3 −4
Original line number Diff line number Diff line
@@ -22,10 +22,9 @@ import android.content.Intent; 
import android.media.MediaLibraryService2;

import android.media.MediaLibraryService2.MediaLibrarySession;

import android.media.MediaLibraryService2.MediaLibrarySessionCallback;

import android.media.MediaPlayerBase;

import android.media.MediaPlayerInterface;

import android.media.MediaSession2;

import android.media.MediaSession2.ControllerInfo;

import android.media.MediaSession2.SessionCallback;

import android.media.MediaSessionService2;

import android.media.VolumeProvider;

import android.media.update.MediaLibraryService2Provider;
@@ -68,8 +67,8 @@ public class MediaLibraryService2Impl extends MediaSessionService2Impl implement 
        private final MediaLibrarySessionCallback mCallback;



        public MediaLibrarySessionImpl(Context context, MediaLibrarySession instance,

                MediaPlayerBase player, String id, VolumeProvider volumeProvider, int ratingType,

                PendingIntent sessionActivity, Executor callbackExecutor,

                MediaPlayerInterface player, String id, VolumeProvider volumeProvider,

                int ratingType, PendingIntent sessionActivity, Executor callbackExecutor,

                MediaLibrarySessionCallback callback)  {

            super(context, instance, player, id, volumeProvider, ratingType, sessionActivity,

                    callbackExecutor, callback);

packages/MediaComponents/src/com/android/media/MediaSession2Impl.java

+11 −12
Original line number Diff line number Diff line
@@ -24,8 +24,7 @@ import android.content.pm.PackageManager.NameNotFoundException; 
import android.media.AudioAttributes;

import android.media.IMediaSession2Callback;

import android.media.MediaItem2;

import android.media.MediaPlayerBase;

import android.media.MediaPlayerBase.PlaybackListener;

import android.media.MediaPlayerInterface;

import android.media.MediaSession2;

import android.media.MediaSession2.Builder;

import android.media.MediaSession2.Command;
@@ -66,7 +65,7 @@ public class MediaSession2Impl implements MediaSession2Provider { 
    private final List<PlaybackListenerHolder> mListeners = new ArrayList<>();



    @GuardedBy("mLock")

    private MediaPlayerBase mPlayer;

    private MediaPlayerInterface mPlayer;

    @GuardedBy("mLock")

    private MyPlaybackListener mListener;
@@ -82,7 +81,7 @@ public class MediaSession2Impl implements MediaSession2Provider { 
     * @param ratingType

     * @param sessionActivity

     */

    public MediaSession2Impl(Context context, MediaSession2 instance, MediaPlayerBase player,

    public MediaSession2Impl(Context context, MediaSession2 instance, MediaPlayerInterface player,

            String id, VolumeProvider volumeProvider, int ratingType, PendingIntent sessionActivity,

            Executor callbackExecutor, SessionCallback callback) {

        mInstance = instance;
@@ -120,7 +119,7 @@ public class MediaSession2Impl implements MediaSession2Provider { 
    //               setPlayer(null). Token can be available when player is null, and

    //               controller can also attach to session.

    @Override

    public void setPlayer_impl(MediaPlayerBase player, VolumeProvider volumeProvider)

    public void setPlayer_impl(MediaPlayerInterface player, VolumeProvider volumeProvider)

            throws IllegalArgumentException {

        ensureCallingThread();

        if (player == null) {
@@ -129,7 +128,7 @@ public class MediaSession2Impl implements MediaSession2Provider { 
        setPlayerInternal(player);

    }



    private void setPlayerInternal(MediaPlayerBase player) {

    private void setPlayerInternal(MediaPlayerInterface player) {

        synchronized (mLock) {

            if (mPlayer == player) {

                // Player didn't changed. No-op.
@@ -166,7 +165,7 @@ public class MediaSession2Impl implements MediaSession2Provider { 
    }



    @Override

    public MediaPlayerBase getPlayer_impl() {

    public MediaPlayerInterface getPlayer_impl() {

        return getPlayer();

    }
@@ -242,7 +241,7 @@ public class MediaSession2Impl implements MediaSession2Provider { 
    // TODO(jaewan): Implement follows

    //////////////////////////////////////////////////////////////////////////////////////

    @Override

    public void setPlayer_impl(MediaPlayerBase player) {

    public void setPlayer_impl(MediaPlayerInterface player) {

        // TODO(jaewan): Implement

    }
@@ -351,7 +350,7 @@ public class MediaSession2Impl implements MediaSession2Provider { 
        return mInstance;

    }



    MediaPlayerBase getPlayer() {

    MediaPlayerInterface getPlayer() {

        return mPlayer;

    }
@@ -363,11 +362,11 @@ public class MediaSession2Impl implements MediaSession2Provider { 
        return mCallback;

    }



    private static class MyPlaybackListener implements MediaPlayerBase.PlaybackListener {

    private static class MyPlaybackListener implements MediaPlayerInterface.PlaybackListener {

        private final WeakReference<MediaSession2Impl> mSession;

        private final MediaPlayerBase mPlayer;

        private final MediaPlayerInterface mPlayer;



        private MyPlaybackListener(MediaSession2Impl session, MediaPlayerBase player) {

        private MyPlaybackListener(MediaSession2Impl session, MediaPlayerInterface player) {

            mSession = new WeakReference<>(session);

            mPlayer = player;

        }

packages/MediaComponents/src/com/android/media/MediaSessionService2Impl.java

+1 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ import android.app.NotificationManager; 
import android.content.Intent;

import android.content.pm.PackageManager;

import android.content.pm.ResolveInfo;

import android.media.MediaPlayerBase.PlaybackListener;

import android.media.MediaPlayerInterface.PlaybackListener;

import android.media.MediaSession2;

import android.media.MediaSessionService2;

import android.media.MediaSessionService2.MediaNotification;
@@ -30,7 +30,6 @@ import android.media.PlaybackState2; 
import android.media.session.PlaybackState;

import android.media.update.MediaSessionService2Provider;

import android.os.IBinder;

import android.os.Looper;

import android.support.annotation.GuardedBy;

import android.util.Log;

packages/MediaComponents/src/com/android/media/PlaybackListenerHolder.java

+1 −3
Original line number Diff line number Diff line
@@ -16,11 +16,9 @@ 


package com.android.media;



import android.media.MediaPlayerBase.PlaybackListener;

import android.media.MediaPlayerInterface.PlaybackListener;

import android.media.PlaybackState2;

import android.media.session.PlaybackState;

import android.os.Handler;

import android.os.Message;

import android.support.annotation.NonNull;



import java.util.List;

packages/MediaComponents/src/com/android/media/update/ApiFactory.java

+3 −3
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ import android.media.MediaController2.ControllerCallback; 
import android.media.MediaLibraryService2;

import android.media.MediaLibraryService2.MediaLibrarySession;

import android.media.MediaLibraryService2.MediaLibrarySessionCallback;

import android.media.MediaPlayerBase;

import android.media.MediaPlayerInterface;

import android.media.MediaSession2;

import android.media.MediaSession2.ControllerInfo;

import android.media.MediaSession2.SessionCallback;
@@ -83,7 +83,7 @@ public class ApiFactory implements StaticProvider { 


    @Override

    public MediaSession2Provider createMediaSession2(Context context, MediaSession2 instance,

            MediaPlayerBase player, String id, VolumeProvider volumeProvider,

            MediaPlayerInterface player, String id, VolumeProvider volumeProvider,

            int ratingType, PendingIntent sessionActivity, Executor callbackExecutor,

            SessionCallback callback) {

        return new MediaSession2Impl(context, instance, player, id, volumeProvider, ratingType,
@@ -112,7 +112,7 @@ public class ApiFactory implements StaticProvider { 


    @Override

    public MediaLibrarySessionProvider createMediaLibraryService2MediaLibrarySession(

            Context context, MediaLibrarySession instance, MediaPlayerBase player,

            Context context, MediaLibrarySession instance, MediaPlayerInterface player,

            String id, VolumeProvider volumeProvider, int ratingType, PendingIntent sessionActivity,

            Executor callbackExecutor, MediaLibrarySessionCallback callback) {

        return new MediaLibrarySessionImpl(context, instance, player, id, volumeProvider,