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

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

Merge "MediaSession2: Apply apilint"

parents 0defd00c c21a3691

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

+3 −3
Original line number Diff line number Diff line
@@ -37,9 +37,9 @@ public class MediaBrowser2Impl extends MediaController2Impl implements MediaBrow 
    private final MediaBrowser2 mInstance;

    private final MediaBrowser2.BrowserCallback mCallback;



    public MediaBrowser2Impl(MediaBrowser2 instance, Context context, SessionToken2 token,

            BrowserCallback callback, Executor executor) {

        super(instance, context, token, callback, executor);

    public MediaBrowser2Impl(Context context, MediaBrowser2 instance, SessionToken2 token,

            Executor executor, BrowserCallback callback) {

        super(context, instance, token, executor, callback);

        mInstance = instance;

        mCallback = callback;

    }

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

+4 −5
Original line number Diff line number Diff line
@@ -31,12 +31,11 @@ import android.media.MediaSession2.CommandButton; 
import android.media.MediaSession2.CommandGroup;

import android.media.MediaController2;

import android.media.MediaController2.ControllerCallback;

import android.media.MediaSession2.PlaylistParam;

import android.media.MediaSession2.PlaylistParams;

import android.media.MediaSessionService2;

import android.media.PlaybackState2;

import android.media.Rating2;

import android.media.SessionToken2;

import android.media.session.PlaybackState;

import android.media.update.MediaController2Provider;

import android.net.Uri;

import android.os.Bundle;
@@ -90,8 +89,8 @@ public class MediaController2Impl implements MediaController2Provider { 


    // TODO(jaewan): Require session activeness changed listener, because controller can be

    //               available when the session's player is null.

    public MediaController2Impl(MediaController2 instance, Context context, SessionToken2 token,

            ControllerCallback callback, Executor executor) {

    public MediaController2Impl(Context context, MediaController2 instance, SessionToken2 token,

            Executor executor, ControllerCallback callback) {

        mInstance = instance;



        if (context == null) {
@@ -382,7 +381,7 @@ public class MediaController2Impl implements MediaController2Provider { 
    }



    @Override

    public PlaylistParam getPlaylistParam_impl() {

    public PlaylistParams getPlaylistParam_impl() {

        // TODO(jaewan): Implement

        return null;

    }

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

+6 −6
Original line number Diff line number Diff line
@@ -67,12 +67,12 @@ public class MediaLibraryService2Impl extends MediaSessionService2Impl implement 
        private final MediaLibrarySession mInstance;

        private final MediaLibrarySessionCallback mCallback;



        public MediaLibrarySessionImpl(MediaLibrarySession instance, Context context,

                MediaPlayerBase player, String id, Executor callbackExecutor,

                MediaLibrarySessionCallback callback, VolumeProvider volumeProvider, int ratingType,

                PendingIntent sessionActivity) {

            super(instance, context, player, id, callbackExecutor, callback, volumeProvider,

                    ratingType, sessionActivity);

        public MediaLibrarySessionImpl(Context context, MediaLibrarySession instance,

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

                PendingIntent sessionActivity, Executor callbackExecutor,

                MediaLibrarySessionCallback callback)  {

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

                    callbackExecutor, callback);

            mInstance = instance;

            mCallback = callback;

        }

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

+6 −7
Original line number Diff line number Diff line
@@ -31,13 +31,12 @@ import android.media.MediaSession2.Command; 
import android.media.MediaSession2.CommandButton;

import android.media.MediaSession2.CommandGroup;

import android.media.MediaSession2.ControllerInfo;

import android.media.MediaSession2.PlaylistParam;

import android.media.MediaSession2.PlaylistParams;

import android.media.MediaSession2.SessionCallback;

import android.media.PlaybackState2;

import android.media.SessionToken2;

import android.media.VolumeProvider;

import android.media.session.MediaSessionManager;

import android.media.session.PlaybackState;

import android.media.update.MediaSession2Provider;

import android.os.Bundle;

import android.os.Handler;
@@ -81,9 +80,9 @@ public class MediaSession2Impl implements MediaSession2Provider { 
     * @param ratingType

     * @param sessionActivity

     */

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

            String id, Executor callbackExecutor, SessionCallback callback,

            VolumeProvider volumeProvider, int ratingType, PendingIntent sessionActivity) {

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

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

            Executor callbackExecutor, SessionCallback callback) {

        mInstance = instance;

        // TODO(jaewan): Keep other params.
@@ -260,7 +259,7 @@ public class MediaSession2Impl implements MediaSession2Provider { 
    }



    @Override

    public void setPlaylist_impl(List<MediaItem2> playlist, PlaylistParam param) {

    public void setPlaylist_impl(List<MediaItem2> playlist, PlaylistParams param) {

        // TODO(jaewan): Implement

    }
@@ -380,7 +379,7 @@ public class MediaSession2Impl implements MediaSession2Provider { 
        // {@link #CALLBACK_FLAG_SESSION_ACTIVENESS}

        private int mFlag;



        public ControllerInfoImpl(ControllerInfo instance, Context context, int uid,

        public ControllerInfoImpl(Context context, ControllerInfo instance, int uid,

                int pid, String packageName, IMediaSession2Callback callback) {

            mInstance = instance;

            mUid = uid;

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

+23 −21
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.content.res.Resources.Theme; 
import android.media.MediaBrowser2;

import android.media.MediaBrowser2.BrowserCallback;

import android.media.MediaController2;

import android.media.MediaController2.ControllerCallback;

import android.media.MediaLibraryService2;

import android.media.MediaLibraryService2.MediaLibrarySession;

import android.media.MediaLibraryService2.MediaLibrarySessionCallback;
@@ -43,6 +44,7 @@ import android.media.update.MediaSessionService2Provider; 
import android.media.update.VideoView2Provider;

import android.media.update.StaticProvider;

import android.media.update.ViewProvider;

import android.os.IInterface;

import android.support.annotation.Nullable;

import android.util.AttributeSet;

import android.widget.MediaControlView2;
@@ -68,32 +70,32 @@ public class ApiFactory implements StaticProvider { 


    @Override

    public MediaController2Provider createMediaController2(

            MediaController2 instance, Context context, SessionToken2 token,

            MediaController2.ControllerCallback callback, Executor executor) {

        return new MediaController2Impl(instance, context, token, callback, executor);

            Context context, MediaController2 instance, SessionToken2 token,

            Executor executor, ControllerCallback callback) {

        return new MediaController2Impl(context, instance, token, executor, callback);

    }



    @Override

    public MediaBrowser2Provider createMediaBrowser2(MediaBrowser2 instance, Context context,

            SessionToken2 token, BrowserCallback callback, Executor executor) {

        return new MediaBrowser2Impl(instance, context, token, callback, executor);

    public MediaBrowser2Provider createMediaBrowser2(Context context, MediaBrowser2 instance,

            SessionToken2 token, Executor executor, BrowserCallback callback) {

        return new MediaBrowser2Impl(context, instance, token, executor, callback);

    }



    @Override

    public MediaSession2Provider createMediaSession2(MediaSession2 instance, Context context,

            MediaPlayerBase player, String id, Executor callbackExecutor, SessionCallback callback,

            VolumeProvider volumeProvider, int ratingType,

            PendingIntent sessionActivity) {

        return new MediaSession2Impl(instance, context, player, id, callbackExecutor, callback,

                volumeProvider, ratingType, sessionActivity);

    public MediaSession2Provider createMediaSession2(Context context, MediaSession2 instance,

            MediaPlayerBase player, String id, VolumeProvider volumeProvider,

            int ratingType, PendingIntent sessionActivity, Executor callbackExecutor,

            SessionCallback callback) {

        return new MediaSession2Impl(context, instance, player, id, volumeProvider, ratingType,

                sessionActivity, callbackExecutor, callback);

    }



    @Override

    public MediaSession2Provider.ControllerInfoProvider createMediaSession2ControllerInfoProvider(

            ControllerInfo instance, Context context, int uid, int pid, String packageName,

            IMediaSession2Callback callback) {

        return new MediaSession2Impl.ControllerInfoImpl(

                instance, context, uid, pid, packageName, callback);

            Context context, ControllerInfo instance, int uid, int pid, String packageName,

            IInterface callback) {

        return new MediaSession2Impl.ControllerInfoImpl(context,

                instance, uid, pid, packageName, (IMediaSession2Callback) callback);

    }



    @Override
@@ -110,11 +112,11 @@ public class ApiFactory implements StaticProvider { 


    @Override

    public MediaLibrarySessionProvider createMediaLibraryService2MediaLibrarySession(

            MediaLibrarySession instance, Context context, MediaPlayerBase player, String id,

            Executor callbackExecutor, MediaLibrarySessionCallback callback,

            VolumeProvider volumeProvider, int ratingType, PendingIntent sessionActivity) {

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

                callback, volumeProvider, ratingType, sessionActivity);

            Context context, MediaLibrarySession instance, MediaPlayerBase player,

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

            Executor callbackExecutor, MediaLibrarySessionCallback callback) {

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

                ratingType, sessionActivity, callbackExecutor, callback);

    }



    @Override