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

Commit bf121d2f authored by Christofer Åkersten's avatar Christofer Åkersten Committed by Android (Google) Code Review
Browse files

Merge "Remove unnecessary Context from ApiLoader" into pi-dev

parents ae2f3689 6bd3ab6d

core/java/android/widget/MediaControlView2.java

+1 −1
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ public class MediaControlView2 extends ViewGroupHelper<MediaControlView2Provider 
    public MediaControlView2(@NonNull Context context, @Nullable AttributeSet attrs,

            int defStyleAttr, int defStyleRes) {

        super((instance, superProvider, privateProvider) ->

                ApiLoader.getProvider(context).createMediaControlView2(

                ApiLoader.getProvider().createMediaControlView2(

                        (MediaControlView2) instance, superProvider, privateProvider,

                        attrs, defStyleAttr, defStyleRes),

                context, attrs, defStyleAttr, defStyleRes);

core/java/android/widget/VideoView2.java

+1 −1
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ public class VideoView2 extends ViewGroupHelper<VideoView2Provider> { 
            @NonNull Context context, @Nullable AttributeSet attrs,

            int defStyleAttr, int defStyleRes) {

        super((instance, superProvider, privateProvider) ->

                ApiLoader.getProvider(context).createVideoView2(

                ApiLoader.getProvider().createVideoView2(

                        (VideoView2) instance, superProvider, privateProvider,

                        attrs, defStyleAttr, defStyleRes),

                context, attrs, defStyleAttr, defStyleRes);

media/java/android/media/MediaBrowser2.java

+2 −2
Original line number Diff line number Diff line
@@ -142,8 +142,8 @@ public class MediaBrowser2 extends MediaController2 { 
    @Override

    MediaBrowser2Provider createProvider(Context context, SessionToken2 token,

            Executor executor, ControllerCallback callback) {

        return ApiLoader.getProvider(context)

                .createMediaBrowser2(context, this, token, executor, (BrowserCallback) callback);

        return ApiLoader.getProvider().createMediaBrowser2(

                context, this, token, executor, (BrowserCallback) callback);

    }



    /**

media/java/android/media/MediaController2.java

+2 −2
Original line number Diff line number Diff line
@@ -366,8 +366,8 @@ public class MediaController2 implements AutoCloseable { 
    MediaController2Provider createProvider(@NonNull Context context,

            @NonNull SessionToken2 token, @NonNull Executor executor,

            @NonNull ControllerCallback callback) {

        return ApiLoader.getProvider(context)

                .createMediaController2(context, this, token, executor, callback);

        return ApiLoader.getProvider().createMediaController2(

                context, this, token, executor, callback);

    }



    /**

media/java/android/media/MediaItem2.java

+2 −3
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ public class MediaItem2 { 
    }



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

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

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

    }



    public String toString() {
@@ -164,8 +164,7 @@ public class MediaItem2 { 
         * @param flags

         */

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

            mProvider = ApiLoader.getProvider(context).createMediaItem2Builder(

                    context, this, flags);

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

        }



        /**