Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Christofer Åkersten
2018-03-22 11:49:41 +00:00
committed by Android (Google) Code Review
parent ae2f368907 6bd3ab6dc6
commit bf121d2f13
14 changed files with 44 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/widget/MediaControlView2.java
View File

@@ -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);

2
core/java/android/widget/VideoView2.java
View File

@@ -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);

4
media/java/android/media/MediaBrowser2.java
View File

@@ -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);
}
/**

4
media/java/android/media/MediaController2.java
View File

@@ -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);
}
/**

5
media/java/android/media/MediaItem2.java
View File

@@ -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);
}
/**

9
media/java/android/media/MediaLibraryService2.java
View File

@@ -210,9 +210,8 @@ public abstract class MediaLibraryService2 extends MediaSessionService2 {
public Builder(@NonNull MediaLibraryService2 service,
@NonNull @CallbackExecutor Executor callbackExecutor,
@NonNull MediaLibrarySessionCallback callback) {
super((instance) -> ApiLoader.getProvider(service)
.createMediaLibraryService2Builder(service, (Builder) instance,
callbackExecutor, callback));
super((instance) -> ApiLoader.getProvider().createMediaLibraryService2Builder(
service, (Builder) instance, callbackExecutor, callback));
}
@Override
@@ -309,7 +308,7 @@ public abstract class MediaLibraryService2 extends MediaSessionService2 {
@Override
MediaSessionService2Provider createProvider() {
return ApiLoader.getProvider(this).createMediaLibraryService2(this);
return ApiLoader.getProvider().createMediaLibraryService2(this);
}
/**
@@ -403,7 +402,7 @@ public abstract class MediaLibraryService2 extends MediaSessionService2 {
*/
public LibraryRoot(@NonNull Context context,
@NonNull String rootId, @Nullable Bundle extras) {
mProvider = ApiLoader.getProvider(context).createMediaLibraryService2LibraryRoot(
mProvider = ApiLoader.getProvider().createMediaLibraryService2LibraryRoot(
context, this, rootId, extras);
}

8
media/java/android/media/MediaMetadata2.java
View File

@@ -684,7 +684,7 @@ public final class MediaMetadata2 {
*/
public static @NonNull MediaMetadata2 fromBundle(@NonNull Context context,
@Nullable Bundle bundle) {
return ApiLoader.getProvider(context).fromBundle_MediaMetadata2(context, bundle);
return ApiLoader.getProvider().fromBundle_MediaMetadata2(context, bundle);
}
/**
@@ -699,8 +699,7 @@ public final class MediaMetadata2 {
* {@link MediaMetadata2} must be added.
*/
public Builder(@NonNull Context context) {
mProvider = ApiLoader.getProvider(context).createMediaMetadata2Builder(
context, this);
mProvider = ApiLoader.getProvider().createMediaMetadata2Builder(context, this);
}
/**
@@ -711,8 +710,7 @@ public final class MediaMetadata2 {
* @param source
*/
public Builder(@NonNull Context context, @NonNull MediaMetadata2 source) {
mProvider = ApiLoader.getProvider(context).createMediaMetadata2Builder(
context, this, source);
mProvider = ApiLoader.getProvider().createMediaMetadata2Builder(context, this, source);
}
/**

2
media/java/android/media/MediaPlaylistAgent.java
View File

@@ -148,7 +148,7 @@ public abstract class MediaPlaylistAgent {
}
public MediaPlaylistAgent(@NonNull Context context) {
mProvider = ApiLoader.getProvider(context).createMediaPlaylistAgent(context, this);
mProvider = ApiLoader.getProvider().createMediaPlaylistAgent(context, this);
}
/**

32
media/java/android/media/MediaSession2.java
View File

@@ -431,16 +431,16 @@ public class MediaSession2 implements AutoCloseable {
private final CommandProvider mProvider;
public Command(@NonNull Context context, int commandCode) {
mProvider = ApiLoader.getProvider(context)
.createMediaSession2Command(this, commandCode, null, null);
mProvider = ApiLoader.getProvider().createMediaSession2Command(
this, commandCode, null, null);
}
public Command(@NonNull Context context, @NonNull String action, @Nullable Bundle extras) {
if (action == null) {
throw new IllegalArgumentException("action shouldn't be null");
}
mProvider = ApiLoader.getProvider(context)
.createMediaSession2Command(this, COMMAND_CODE_CUSTOM, action, extras);
mProvider = ApiLoader.getProvider().createMediaSession2Command(
this, COMMAND_CODE_CUSTOM, action, extras);
}
/**
@@ -488,7 +488,7 @@ public class MediaSession2 implements AutoCloseable {
* @hide
*/
public static Command fromBundle(@NonNull Context context, @NonNull Bundle command) {
return ApiLoader.getProvider(context).fromBundle_MediaSession2Command(context, command);
return ApiLoader.getProvider().fromBundle_MediaSession2Command(context, command);
}
}
@@ -499,13 +499,13 @@ public class MediaSession2 implements AutoCloseable {
private final CommandGroupProvider mProvider;
public CommandGroup(@NonNull Context context) {
mProvider = ApiLoader.getProvider(context)
.createMediaSession2CommandGroup(context, this, null);
mProvider = ApiLoader.getProvider().createMediaSession2CommandGroup(
context, this, null);
}
public CommandGroup(@NonNull Context context, @Nullable CommandGroup others) {
mProvider = ApiLoader.getProvider(context)
.createMediaSession2CommandGroup(context, this, others);
mProvider = ApiLoader.getProvider().createMediaSession2CommandGroup(
context, this, others);
}
/**
@@ -559,8 +559,7 @@ public class MediaSession2 implements AutoCloseable {
* @hide
*/
public static @Nullable CommandGroup fromBundle(Context context, Bundle commands) {
return ApiLoader.getProvider(context)
.fromBundle_MediaSession2CommandGroup(context, commands);
return ApiLoader.getProvider().fromBundle_MediaSession2CommandGroup(context, commands);
}
}
@@ -1010,7 +1009,7 @@ public class MediaSession2 implements AutoCloseable {
// This workarounds javadoc issue described in the MediaSession2.BuilderBase.
public static final class Builder extends BuilderBase<MediaSession2, Builder, SessionCallback> {
public Builder(Context context) {
super((instance) -> ApiLoader.getProvider(context).createMediaSession2Builder(
super((instance) -> ApiLoader.getProvider().createMediaSession2Builder(
context, (Builder) instance));
}
@@ -1062,9 +1061,8 @@ public class MediaSession2 implements AutoCloseable {
*/
public ControllerInfo(@NonNull Context context, int uid, int pid,
@NonNull String packageName, @NonNull IInterface callback) {
mProvider = ApiLoader.getProvider(context)
.createMediaSession2ControllerInfo(
context, this, uid, pid, packageName, callback);
mProvider = ApiLoader.getProvider().createMediaSession2ControllerInfo(
context, this, uid, pid, packageName, callback);
}
/**
@@ -1192,8 +1190,8 @@ public class MediaSession2 implements AutoCloseable {
private final CommandButtonProvider.BuilderProvider mProvider;
public Builder(@NonNull Context context) {
mProvider = ApiLoader.getProvider(context)
.createMediaSession2CommandButtonBuilder(context, this);
mProvider = ApiLoader.getProvider().createMediaSession2CommandButtonBuilder(
context, this);
}
public @NonNull Builder setCommand(@Nullable Command command) {

7
media/java/android/media/MediaSessionService2.java
View File

@@ -123,7 +123,7 @@ public abstract class MediaSessionService2 extends Service {
}
MediaSessionService2Provider createProvider() {
return ApiLoader.getProvider(this).createMediaSessionService2(this);
return ApiLoader.getProvider().createMediaSessionService2(this);
}
/**
@@ -220,9 +220,8 @@ public abstract class MediaSessionService2 extends Service {
*/
public MediaNotification(@NonNull Context context,
int notificationId, @NonNull Notification notification) {
mProvider = ApiLoader.getProvider(context)
.createMediaSessionService2MediaNotification(
context, this, notificationId, notification);
mProvider = ApiLoader.getProvider().createMediaSessionService2MediaNotification(
context, this, notificationId, notification);
}
public int getNotificationId() {

13
media/java/android/media/Rating2.java
View File

@@ -131,7 +131,7 @@ public final class Rating2 {
* @return new Rating2 instance or {@code null} for error
*/
public static Rating2 fromBundle(@NonNull Context context, @Nullable Bundle bundle) {
return ApiLoader.getProvider(context).fromBundle_Rating2(context, bundle);
return ApiLoader.getProvider().fromBundle_Rating2(context, bundle);
}
/**
@@ -154,7 +154,7 @@ public final class Rating2 {
*/
public static @Nullable Rating2 newUnratedRating(@NonNull Context context,
@Style int ratingStyle) {
return ApiLoader.getProvider(context).newUnratedRating_Rating2(context, ratingStyle);
return ApiLoader.getProvider().newUnratedRating_Rating2(context, ratingStyle);
}
/**
@@ -166,7 +166,7 @@ public final class Rating2 {
* @return a new Rating2 instance.
*/
public static @Nullable Rating2 newHeartRating(@NonNull Context context, boolean hasHeart) {
return ApiLoader.getProvider(context).newHeartRating_Rating2(context, hasHeart);
return ApiLoader.getProvider().newHeartRating_Rating2(context, hasHeart);
}
/**
@@ -178,7 +178,7 @@ public final class Rating2 {
* @return a new Rating2 instance.
*/
public static @Nullable Rating2 newThumbRating(@NonNull Context context, boolean thumbIsUp) {
return ApiLoader.getProvider(context).newThumbRating_Rating2(context, thumbIsUp);
return ApiLoader.getProvider().newThumbRating_Rating2(context, thumbIsUp);
}
/**
@@ -196,8 +196,7 @@ public final class Rating2 {
*/
public static @Nullable Rating2 newStarRating(@NonNull Context context,
@StarStyle int starRatingStyle, float starRating) {
return ApiLoader.getProvider(context).newStarRating_Rating2(
context, starRatingStyle, starRating);
return ApiLoader.getProvider().newStarRating_Rating2(context, starRatingStyle, starRating);
}
/**
@@ -209,7 +208,7 @@ public final class Rating2 {
* @return null if the rating is out of range, a new Rating2 instance otherwise.
*/
public static @Nullable Rating2 newPercentageRating(@NonNull Context context, float percent) {
return ApiLoader.getProvider(context).newPercentageRating_Rating2(context, percent);
return ApiLoader.getProvider().newPercentageRating_Rating2(context, percent);
}
/**

4
media/java/android/media/SessionToken2.java
View File

@@ -80,7 +80,7 @@ public final class SessionToken2 {
*/
public SessionToken2(@NonNull Context context, @NonNull String packageName,
@NonNull String serviceName, int uid) {
mProvider = ApiLoader.getProvider(context).createSessionToken2(
mProvider = ApiLoader.getProvider().createSessionToken2(
context, this, packageName, serviceName, uid);
}
@@ -150,7 +150,7 @@ public final class SessionToken2 {
* @return
*/
public static SessionToken2 fromBundle(@NonNull Context context, @NonNull Bundle bundle) {
return ApiLoader.getProvider(context).fromBundle_SessionToken2(context, bundle);
return ApiLoader.getProvider().fromBundle_SessionToken2(context, bundle);
}
/**

2
media/java/android/media/VolumeProvider2.java
View File

@@ -76,7 +76,7 @@ public abstract class VolumeProvider2 {
*/
public VolumeProvider2(@NonNull Context context, @ControlType int controlType,
int maxVolume, int currentVolume) {
mProvider = ApiLoader.getProvider(context).createVolumeProvider2(
mProvider = ApiLoader.getProvider().createVolumeProvider2(
context, this, controlType, maxVolume, currentVolume);
}

7
media/java/android/media/update/ApiLoader.java
View File

@@ -46,11 +46,6 @@ public final class ApiLoader {
private ApiLoader() { }
@Deprecated
public static StaticProvider getProvider(Context context) {
return getProvider();
}
public static StaticProvider getProvider() {
if (sMediaUpdatable != null) return sMediaUpdatable;
@@ -79,7 +74,7 @@ public final class ApiLoader {
ActivityManager.getService().addPackageDependency(ai.packageName);
}
PathClassLoader classLoader = new PathClassLoader(ai.sourceDir,
ClassLoader classLoader = new PathClassLoader(ai.sourceDir,
ai.nativeLibraryDir + File.pathSeparator + System.getProperty("java.library.path"),
ClassLoader.getSystemClassLoader().getParent());
return sMediaUpdatable = (StaticProvider) classLoader.loadClass(UPDATE_CLASS)