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

Merge "Make MediaRouter2 callback classes as abstract" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-02-28 11:38:39 +00:00
committed by Android (Google) Code Review
parent f43e6bc49d 899535c9ff
commit fde0af9177
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
api/current.txt
View File

@@ -27059,7 +27059,7 @@ package android.media {
method public void unregisterTransferCallback(@NonNull android.media.MediaRouter2.TransferCallback);
}
public static class MediaRouter2.ControllerCallback {
public abstract static class MediaRouter2.ControllerCallback {
ctor public MediaRouter2.ControllerCallback();
method public void onControllerUpdated(@NonNull android.media.MediaRouter2.RoutingController);
}
@@ -27068,7 +27068,7 @@ package android.media {
method @Nullable public android.os.Bundle onGetControllerHints(@NonNull android.media.MediaRoute2Info);
}
public static class MediaRouter2.RouteCallback {
public abstract static class MediaRouter2.RouteCallback {
ctor public MediaRouter2.RouteCallback();
method public void onRoutesAdded(@NonNull java.util.List<android.media.MediaRoute2Info>);
method public void onRoutesChanged(@NonNull java.util.List<android.media.MediaRoute2Info>);
@@ -27091,7 +27091,7 @@ package android.media {
method public void setVolume(int);
}
public static class MediaRouter2.TransferCallback {
public abstract static class MediaRouter2.TransferCallback {
ctor public MediaRouter2.TransferCallback();
method public void onTransferFailed(@NonNull android.media.MediaRoute2Info);
method public void onTransferred(@NonNull android.media.MediaRouter2.RoutingController, @Nullable android.media.MediaRouter2.RoutingController);

6
media/java/android/media/MediaRouter2.java
View File

@@ -749,7 +749,7 @@ public class MediaRouter2 {
/**
* Callback for receiving events about media route discovery.
*/
public static class RouteCallback {
public abstract static class RouteCallback {
/**
* Called when routes are added. Whenever you registers a callback, this will
* be invoked with known routes.
@@ -777,7 +777,7 @@ public class MediaRouter2 {
/**
* Callback for receiving events on media transfer.
*/
public static class TransferCallback {
public abstract static class TransferCallback {
/**
* Called when a media is transferred between two different routing controllers.
* This can happen by calling {@link #transferTo(MediaRoute2Info)} or
@@ -826,7 +826,7 @@ public class MediaRouter2 {
/**
* Callback for receiving {@link RoutingController} updates.
*/
public static class ControllerCallback {
public abstract static class ControllerCallback {
/**
* Called when a controller is updated. (e.g., the selected routes of the
* controller is changed or the volume of the controller is changed.)

12
media/tests/MediaRouter/src/com/android/mediaroutertest/MediaRouter2ManagerTest.java
View File

@@ -123,7 +123,7 @@ public class MediaRouter2ManagerTest {
@Test
public void testOnRoutesRemovedAndAdded() throws Exception {
RouteCallback routeCallback = new RouteCallback();
RouteCallback routeCallback = new RouteCallback() {};
mRouteCallbacks.add(routeCallback);
mRouter2.registerRouteCallback(mExecutor, routeCallback,
new RouteDiscoveryPreference.Builder(FEATURES_ALL, true).build());
@@ -201,7 +201,7 @@ public class MediaRouter2ManagerTest {
addManagerCallback(new MediaRouter2Manager.Callback());
//TODO: remove this when it's not necessary.
addRouterCallback(new MediaRouter2.RouteCallback());
addRouterCallback(new MediaRouter2.RouteCallback() {});
addTransferCallback(new MediaRouter2.TransferCallback() {
@Override
public void onTransferred(MediaRouter2.RoutingController oldController,
@@ -228,7 +228,7 @@ public class MediaRouter2ManagerTest {
CountDownLatch latch = new CountDownLatch(1);
Map<String, MediaRoute2Info> routes = waitAndGetRoutesWithManager(FEATURES_ALL);
addRouterCallback(new RouteCallback());
addRouterCallback(new RouteCallback() {});
addManagerCallback(new MediaRouter2Manager.Callback() {
@Override
public void onSessionCreated(MediaRouter2Manager.RoutingController controller) {
@@ -263,7 +263,7 @@ public class MediaRouter2ManagerTest {
@Test
public void testSelectAndTransferAndRelease() throws Exception {
Map<String, MediaRoute2Info> routes = waitAndGetRoutesWithManager(FEATURES_ALL);
addRouterCallback(new RouteCallback());
addRouterCallback(new RouteCallback() {});
CountDownLatch onSessionCreatedLatch = new CountDownLatch(1);
@@ -346,7 +346,7 @@ public class MediaRouter2ManagerTest {
@Test
public void testSetSessionVolume() throws Exception {
Map<String, MediaRoute2Info> routes = waitAndGetRoutesWithManager(FEATURES_ALL);
addRouterCallback(new RouteCallback());
addRouterCallback(new RouteCallback() {});
CountDownLatch onSessionCreatedLatch = new CountDownLatch(1);
CountDownLatch volumeChangedLatch = new CountDownLatch(2);
@@ -471,7 +471,7 @@ public class MediaRouter2ManagerTest {
CountDownLatch featuresLatch = new CountDownLatch(1);
// A dummy callback is required to send route feature info.
RouteCallback routeCallback = new RouteCallback();
RouteCallback routeCallback = new RouteCallback() {};
MediaRouter2Manager.Callback managerCallback = new MediaRouter2Manager.Callback() {
@Override
public void onRoutesAdded(List<MediaRoute2Info> routes) {