Merge "MediaRouter: Rename methods in TransferCallback" into rvc-dev
diff --git a/api/current.txt b/api/current.txt
index 9407549..63fbbeb 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -27096,9 +27096,9 @@
public abstract static class MediaRouter2.TransferCallback {
ctor public MediaRouter2.TransferCallback();
- method public void onStopped(@NonNull android.media.MediaRouter2.RoutingController);
- method public void onTransferFailed(@NonNull android.media.MediaRoute2Info);
- method public void onTransferred(@NonNull android.media.MediaRouter2.RoutingController, @NonNull android.media.MediaRouter2.RoutingController);
+ method public void onStop(@NonNull android.media.MediaRouter2.RoutingController);
+ method public void onTransfer(@NonNull android.media.MediaRouter2.RoutingController, @NonNull android.media.MediaRouter2.RoutingController);
+ method public void onTransferFailure(@NonNull android.media.MediaRoute2Info);
}
public class MediaScannerConnection implements android.content.ServiceConnection {
diff --git a/media/java/android/media/MediaRouter2.java b/media/java/android/media/MediaRouter2.java
index bde45d7..25f6059 100644
--- a/media/java/android/media/MediaRouter2.java
+++ b/media/java/android/media/MediaRouter2.java
@@ -374,8 +374,8 @@
* @param route the route you want to transfer the current media to. Pass {@code null} to
* stop routing of the current media.
*
- * @see TransferCallback#onTransferred
- * @see TransferCallback#onTransferFailed
+ * @see TransferCallback#onTransfer
+ * @see TransferCallback#onTransferFailure
*/
public void transferTo(@NonNull MediaRoute2Info route) {
Objects.requireNonNull(route, "route must not be null");
@@ -565,9 +565,9 @@
}
/**
- * Creates a controller and calls the {@link TransferCallback#onTransferred}.
+ * Creates a controller and calls the {@link TransferCallback#onTransfer}.
* If the controller creation has failed, then it calls
- * {@link TransferCallback#onTransferFailed}.
+ * {@link TransferCallback#onTransferFailure}.
* <p>
* Pass {@code null} to sessionInfo for the failure case.
*/
@@ -740,21 +740,21 @@
RoutingController newController) {
for (TransferCallbackRecord record: mTransferCallbackRecords) {
record.mExecutor.execute(
- () -> record.mTransferCallback.onTransferred(oldController, newController));
+ () -> record.mTransferCallback.onTransfer(oldController, newController));
}
}
private void notifyTransferFailed(MediaRoute2Info route) {
for (TransferCallbackRecord record: mTransferCallbackRecords) {
record.mExecutor.execute(
- () -> record.mTransferCallback.onTransferFailed(route));
+ () -> record.mTransferCallback.onTransferFailure(route));
}
}
private void notifyStopped(RoutingController controller) {
for (TransferCallbackRecord record: mTransferCallbackRecords) {
record.mExecutor.execute(
- () -> record.mTransferCallback.onStopped(controller));
+ () -> record.mTransferCallback.onStop(controller));
}
}
@@ -805,7 +805,7 @@
* @param newController the new controller to control routing
* @see #transferTo(MediaRoute2Info)
*/
- public void onTransferred(@NonNull RoutingController oldController,
+ public void onTransfer(@NonNull RoutingController oldController,
@NonNull RoutingController newController) {}
/**
@@ -813,14 +813,14 @@
*
* @param requestedRoute the route info which was used for the transfer
*/
- public void onTransferFailed(@NonNull MediaRoute2Info requestedRoute) {}
+ public void onTransferFailure(@NonNull MediaRoute2Info requestedRoute) {}
/**
* Called when a media routing stops. It can be stopped by a user or a provider.
*
* @param controller the controller that controlled the stopped media routing.
*/
- public void onStopped(@NonNull RoutingController controller) { }
+ public void onStop(@NonNull RoutingController controller) { }
}
/**
diff --git a/media/tests/MediaRouter/src/com/android/mediaroutertest/MediaRouter2ManagerTest.java b/media/tests/MediaRouter/src/com/android/mediaroutertest/MediaRouter2ManagerTest.java
index a97baaf..77e8f97 100644
--- a/media/tests/MediaRouter/src/com/android/mediaroutertest/MediaRouter2ManagerTest.java
+++ b/media/tests/MediaRouter/src/com/android/mediaroutertest/MediaRouter2ManagerTest.java
@@ -204,7 +204,7 @@
addRouterCallback(new MediaRouter2.RouteCallback() {});
addTransferCallback(new MediaRouter2.TransferCallback() {
@Override
- public void onTransferred(MediaRouter2.RoutingController oldController,
+ public void onTransfer(MediaRouter2.RoutingController oldController,
MediaRouter2.RoutingController newController) {
if (newController == null) {
return;