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

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

Merge "Remove unneeded context" into pi-dev

parents c2bdecb8 6823d81d

media/java/android/media/MediaItem2.java

+4 −6
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package android.media; 
import android.annotation.IntDef;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.content.Context;

import android.media.update.ApiLoader;

import android.media.update.MediaItem2Provider;

import android.os.Bundle;
@@ -81,8 +80,8 @@ public class MediaItem2 { 
        return mProvider.toBundle_impl();

    }



    public static MediaItem2 fromBundle(Context context, Bundle bundle) {

        return ApiLoader.getProvider().fromBundle_MediaItem2(context, bundle);

    public static MediaItem2 fromBundle(Bundle bundle) {

        return ApiLoader.getProvider().fromBundle_MediaItem2(bundle);

    }



    public String toString() {
@@ -161,11 +160,10 @@ public class MediaItem2 { 
        /**

         * Constructor for {@link Builder}

         *

         * @param context

         * @param flags

         */

        public Builder(@NonNull Context context, @Flags int flags) {

            mProvider = ApiLoader.getProvider().createMediaItem2Builder(context, this, flags);

        public Builder(@Flags int flags) {

            mProvider = ApiLoader.getProvider().createMediaItem2Builder(this, flags);

        }



        /**

media/java/android/media/MediaLibraryService2.java

+4 −6
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import android.annotation.CallbackExecutor; 
import android.annotation.NonNull;

import android.annotation.Nullable;

import android.app.PendingIntent;

import android.content.Context;

import android.media.MediaLibraryService2.MediaLibrarySession.Builder;

import android.media.MediaLibraryService2.MediaLibrarySession.MediaLibrarySessionCallback;

import android.media.MediaSession2.ControllerInfo;
@@ -74,8 +73,8 @@ public abstract class MediaLibraryService2 extends MediaSessionService2 { 
         * Callback for the {@link MediaLibrarySession}.

         */

        public static class MediaLibrarySessionCallback extends MediaSession2.SessionCallback {

            public MediaLibrarySessionCallback(@NonNull Context context) {

                super(context);

            public MediaLibrarySessionCallback() {

                super();

            }



            /**
@@ -401,10 +400,9 @@ public abstract class MediaLibraryService2 extends MediaSessionService2 { 
         * @param rootId The root id for browsing.

         * @param extras Any extras about the library service.

         */

        public LibraryRoot(@NonNull Context context,

                @NonNull String rootId, @Nullable Bundle extras) {

        public LibraryRoot(@NonNull String rootId, @Nullable Bundle extras) {

            mProvider = ApiLoader.getProvider().createMediaLibraryService2LibraryRoot(

                    context, this, rootId, extras);

                    this, rootId, extras);

        }



        /**

media/java/android/media/MediaMetadata2.java

+6 −9
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package android.media; 
import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.StringDef;

import android.content.Context;

import android.graphics.Bitmap;

import android.media.update.ApiLoader;

import android.media.update.MediaMetadata2Provider;
@@ -657,13 +656,11 @@ public final class MediaMetadata2 { 
     * Creates the {@link MediaMetadata2} from the bundle that previously returned by

     * {@link #toBundle()}.

     *

     * @param context context

     * @param bundle bundle for the metadata

     * @return a new MediaMetadata2

     */

    public static @NonNull MediaMetadata2 fromBundle(@NonNull Context context,

            @Nullable Bundle bundle) {

        return ApiLoader.getProvider().fromBundle_MediaMetadata2(context, bundle);

    public static @NonNull MediaMetadata2 fromBundle(@Nullable Bundle bundle) {

        return ApiLoader.getProvider().fromBundle_MediaMetadata2(bundle);

    }



    /**
@@ -677,8 +674,8 @@ public final class MediaMetadata2 { 
         * Create an empty Builder. Any field that should be included in the

         * {@link MediaMetadata2} must be added.

         */

        public Builder(@NonNull Context context) {

            mProvider = ApiLoader.getProvider().createMediaMetadata2Builder(context, this);

        public Builder() {

            mProvider = ApiLoader.getProvider().createMediaMetadata2Builder(this);

        }



        /**
@@ -688,8 +685,8 @@ public final class MediaMetadata2 { 
         *

         * @param source

         */

        public Builder(@NonNull Context context, @NonNull MediaMetadata2 source) {

            mProvider = ApiLoader.getProvider().createMediaMetadata2Builder(context, this, source);

        public Builder(@NonNull MediaMetadata2 source) {

            mProvider = ApiLoader.getProvider().createMediaMetadata2Builder(this, source);

        }



        /**

media/java/android/media/MediaPlaylistAgent.java

+2 −3
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import android.annotation.CallbackExecutor; 
import android.annotation.IntDef;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.content.Context;

import android.media.update.ApiLoader;

import android.media.update.MediaPlaylistAgentProvider;
@@ -148,8 +147,8 @@ public abstract class MediaPlaylistAgent { 
                @RepeatMode int repeatMode) { }

    }



    public MediaPlaylistAgent(@NonNull Context context) {

        mProvider = ApiLoader.getProvider().createMediaPlaylistAgent(context, this);

    public MediaPlaylistAgent() {

        mProvider = ApiLoader.getProvider().createMediaPlaylistAgent(this);

    }



    /**

media/java/android/media/MediaSession2.java

+13 −25
Original line number Diff line number Diff line
@@ -445,12 +445,12 @@ public class MediaSession2 implements AutoCloseable { 
    public static final class Command {

        private final CommandProvider mProvider;



        public Command(@NonNull Context context, int commandCode) {

        public Command(int commandCode) {

            mProvider = ApiLoader.getProvider().createMediaSession2Command(

                    this, commandCode, null, null);

        }



        public Command(@NonNull Context context, @NonNull String action, @Nullable Bundle extras) {

        public Command(@NonNull String action, @Nullable Bundle extras) {

            if (action == null) {

                throw new IllegalArgumentException("action shouldn't be null");

            }
@@ -502,8 +502,8 @@ public class MediaSession2 implements AutoCloseable { 
         * @return a new Command instance from the Bundle

         * @hide

         */

        public static Command fromBundle(@NonNull Context context, @NonNull Bundle command) {

            return ApiLoader.getProvider().fromBundle_MediaSession2Command(context, command);

        public static Command fromBundle(@NonNull Bundle command) {

            return ApiLoader.getProvider().fromBundle_MediaSession2Command(command);

        }

    }
@@ -513,14 +513,12 @@ public class MediaSession2 implements AutoCloseable { 
    public static final class CommandGroup {

        private final CommandGroupProvider mProvider;



        public CommandGroup(@NonNull Context context) {

            mProvider = ApiLoader.getProvider().createMediaSession2CommandGroup(

                    context, this, null);

        public CommandGroup() {

            mProvider = ApiLoader.getProvider().createMediaSession2CommandGroup(this, null);

        }



        public CommandGroup(@NonNull Context context, @Nullable CommandGroup others) {

            mProvider = ApiLoader.getProvider().createMediaSession2CommandGroup(

                    context, this, others);

        public CommandGroup(@Nullable CommandGroup others) {

            mProvider = ApiLoader.getProvider().createMediaSession2CommandGroup(this, others);

        }



        /**
@@ -581,8 +579,8 @@ public class MediaSession2 implements AutoCloseable { 
         * @return new instance of CommandGroup from the bundle

         * @hide

         */

        public static @Nullable CommandGroup fromBundle(Context context, Bundle commands) {

            return ApiLoader.getProvider().fromBundle_MediaSession2CommandGroup(context, commands);

        public static @Nullable CommandGroup fromBundle(Bundle commands) {

            return ApiLoader.getProvider().fromBundle_MediaSession2CommandGroup(commands);

        }

    }
@@ -594,15 +592,6 @@ public class MediaSession2 implements AutoCloseable { 
     */

    // TODO(jaewan): Move this to updatable for default implementation (b/74091963)

    public static abstract class SessionCallback {

        private final Context mContext;



        public SessionCallback(@NonNull Context context) {

            if (context == null) {

                throw new IllegalArgumentException("context shouldn't be null");

            }

            mContext = context;

        }



        /**

         * Called when a controller is created for this session. Return allowed commands for

         * controller. By default it allows all connection requests and commands.
@@ -617,7 +606,7 @@ public class MediaSession2 implements AutoCloseable { 
         */

        public @Nullable CommandGroup onConnect(@NonNull MediaSession2 session,

                @NonNull ControllerInfo controller) {

            CommandGroup commands = new CommandGroup(mContext);

            CommandGroup commands = new CommandGroup();

            commands.addAllPredefinedCommands();

            return commands;

        }
@@ -1221,9 +1210,8 @@ public class MediaSession2 implements AutoCloseable { 
        public static final class Builder {

            private final CommandButtonProvider.BuilderProvider mProvider;



            public Builder(@NonNull Context context) {

                mProvider = ApiLoader.getProvider().createMediaSession2CommandButtonBuilder(

                        context, this);

            public Builder() {

                mProvider = ApiLoader.getProvider().createMediaSession2CommandButtonBuilder(this);

            }



            public @NonNull Builder setCommand(@Nullable Command command) {