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

Commit 85701d10 authored Mar 22, 2018 by Christofer Åkersten Committed by android-build-merger Mar 22, 2018

Merge "Remove unnecessary Context from ApiLoader" into pi-dev am: bf121d2f

am: 0f524c02

Change-Id: I648e9a39a7c546cedae9b20cc264dc88d9598473

parents 5f3e3796 0f524c02

core/java/android/widget/MediaControlView2.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -150,7 +150,7 @@ public class MediaControlView2 extends ViewGroupHelper<MediaControlView2Provider
	public MediaControlView2(@NonNull Context context, @Nullable AttributeSet attrs,		public MediaControlView2(@NonNull Context context, @Nullable AttributeSet attrs,
	int defStyleAttr, int defStyleRes) {		int defStyleAttr, int defStyleRes) {
	super((instance, superProvider, privateProvider) ->		super((instance, superProvider, privateProvider) ->
	ApiLoader.getProvider(context).createMediaControlView2(		ApiLoader.getProvider().createMediaControlView2(
	(MediaControlView2) instance, superProvider, privateProvider,		(MediaControlView2) instance, superProvider, privateProvider,
	attrs, defStyleAttr, defStyleRes),		attrs, defStyleAttr, defStyleRes),
	context, attrs, defStyleAttr, defStyleRes);		context, attrs, defStyleAttr, defStyleRes);

core/java/android/widget/VideoView2.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -143,7 +143,7 @@ public class VideoView2 extends ViewGroupHelper<VideoView2Provider> {
	@NonNull Context context, @Nullable AttributeSet attrs,		@NonNull Context context, @Nullable AttributeSet attrs,
	int defStyleAttr, int defStyleRes) {		int defStyleAttr, int defStyleRes) {
	super((instance, superProvider, privateProvider) ->		super((instance, superProvider, privateProvider) ->
	ApiLoader.getProvider(context).createVideoView2(		ApiLoader.getProvider().createVideoView2(
	(VideoView2) instance, superProvider, privateProvider,		(VideoView2) instance, superProvider, privateProvider,
	attrs, defStyleAttr, defStyleRes),		attrs, defStyleAttr, defStyleRes),
	context, attrs, defStyleAttr, defStyleRes);		context, attrs, defStyleAttr, defStyleRes);

media/java/android/media/MediaBrowser2.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -142,8 +142,8 @@ public class MediaBrowser2 extends MediaController2 {
	@Override		@Override
	MediaBrowser2Provider createProvider(Context context, SessionToken2 token,		MediaBrowser2Provider createProvider(Context context, SessionToken2 token,
	Executor executor, ControllerCallback callback) {		Executor executor, ControllerCallback callback) {
	return ApiLoader.getProvider(context)		return ApiLoader.getProvider().createMediaBrowser2(
	.createMediaBrowser2(context, this, token, executor, (BrowserCallback) callback);		context, this, token, executor, (BrowserCallback) callback);
	}		}

	/**		/**

media/java/android/media/MediaController2.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -366,8 +366,8 @@ public class MediaController2 implements AutoCloseable {
	MediaController2Provider createProvider(@NonNull Context context,		MediaController2Provider createProvider(@NonNull Context context,
	@NonNull SessionToken2 token, @NonNull Executor executor,		@NonNull SessionToken2 token, @NonNull Executor executor,
	@NonNull ControllerCallback callback) {		@NonNull ControllerCallback callback) {
	return ApiLoader.getProvider(context)		return ApiLoader.getProvider().createMediaController2(
	.createMediaController2(context, this, token, executor, callback);		context, this, token, executor, callback);
	}		}

	/**		/**

media/java/android/media/MediaItem2.java

+2 −3

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

	public static MediaItem2 fromBundle(Context context, Bundle bundle) {		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() {		public String toString() {
	@@ -164,8 +164,7 @@ public class MediaItem2 {
	* @param flags		* @param flags
	*/		*/
	public Builder(@NonNull Context context, @Flags int flags) {		public Builder(@NonNull Context context, @Flags int flags) {
	mProvider = ApiLoader.getProvider(context).createMediaItem2Builder(		mProvider = ApiLoader.getProvider().createMediaItem2Builder(context, this, flags);
	context, this, flags);
	}		}

	/**		/**