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

Commit 5bf22a1f authored by Iván Budnik's avatar Iván Budnik
Browse files

Rename selectRoute(String, MediaRoute2Info) to transfer() 

The new method represents the real underlying operation, which is a
routing session transfer to a different device. The appropriate method
for route selection is selectRoute(RoutingSessionInfo, MediaRoute2Info).

This change is a non-functional refactor.

Bug: 238178508
Bug: 205124386
Test: atest CtsMediaBetterTogetherTestCases MediaDeviceTest
MediaRouter2Manager InfoMediaManagerTest

Change-Id: Ic199686849365138049ccb73189bbc03703117b1
parent 97beb94d

media/java/android/media/MediaRouter2.java

+1 −1
Original line number Diff line number Diff line
@@ -603,7 +603,7 @@ public final class MediaRouter2 { 
     */

    public void transferTo(@NonNull MediaRoute2Info route) {

        if (isSystemRouter()) {

            sManager.selectRoute(mClientPackageName, route);

            sManager.transfer(mClientPackageName, route);

            return;

        }

media/java/android/media/MediaRouter2Manager.java

+6 −4
Original line number Diff line number Diff line
@@ -448,14 +448,16 @@ public final class MediaRouter2Manager { 
    }



    /**

     * Selects media route for the specified package name.

     * Transfers a {@link RoutingSessionInfo routing session} belonging to a specified package name

     * to a {@link MediaRoute2Info media route}.

     *

     * <p>Same as {@link #transfer(RoutingSessionInfo, MediaRoute2Info)}, but resolves the routing

     * session based on the provided package name.

     */

    public void selectRoute(@NonNull String packageName, @NonNull MediaRoute2Info route) {

    public void transfer(@NonNull String packageName, @NonNull MediaRoute2Info route) {

        Objects.requireNonNull(packageName, "packageName must not be null");

        Objects.requireNonNull(route, "route must not be null");



        Log.v(TAG, "Selecting route. packageName= " + packageName + ", route=" + route);



        List<RoutingSessionInfo> sessionInfos = getRoutingSessions(packageName);

        RoutingSessionInfo targetSession = sessionInfos.get(sessionInfos.size() - 1);

        transfer(targetSession, route);

media/tests/MediaRouter/src/com/android/mediaroutertest/MediaRouter2ManagerTest.java

+9 −9
Original line number Diff line number Diff line
@@ -384,7 +384,7 @@ public class MediaRouter2ManagerTest { 
        MediaRoute2Info routeToSelect = routes.get(ROUTE_ID1);

        assertThat(routeToSelect).isNotNull();



        mManager.selectRoute(mPackageName, routeToSelect);

        mManager.transfer(mPackageName, routeToSelect);

        assertThat(latch.await(TIMEOUT_MS, TimeUnit.MILLISECONDS)).isTrue();

        assertThat(mManager.getRemoteSessions()).hasSize(1);

    }
@@ -410,7 +410,7 @@ public class MediaRouter2ManagerTest { 


        assertThat(mManager.getRoutingSessions(mPackageName)).hasSize(1);



        mManager.selectRoute(mPackageName, routeToSelect);

        mManager.transfer(mPackageName, routeToSelect);

        assertThat(latch.await(TIMEOUT_MS, TimeUnit.MILLISECONDS)).isTrue();



        List<RoutingSessionInfo> sessions = mManager.getRoutingSessions(mPackageName);
@@ -514,7 +514,7 @@ public class MediaRouter2ManagerTest { 
            }

        });

        awaitOnRouteChangedManager(

                () -> mManager.selectRoute(mPackageName, routes.get(ROUTE_ID1)),

                () -> mManager.transfer(mPackageName, routes.get(ROUTE_ID1)),

                ROUTE_ID1,

                route -> TextUtils.equals(route.getClientPackageName(), mPackageName));

        assertThat(onSessionCreatedLatch.await(TIMEOUT_MS, TimeUnit.MILLISECONDS)).isTrue();
@@ -525,7 +525,7 @@ public class MediaRouter2ManagerTest { 
        RoutingSessionInfo sessionInfo = sessions.get(1);



        awaitOnRouteChangedManager(

                () -> mManager.selectRoute(mPackageName, routes.get(ROUTE_ID5_TO_TRANSFER_TO)),

                () -> mManager.transfer(mPackageName, routes.get(ROUTE_ID5_TO_TRANSFER_TO)),

                ROUTE_ID5_TO_TRANSFER_TO,

                route -> TextUtils.equals(route.getClientPackageName(), mPackageName));
@@ -583,9 +583,9 @@ public class MediaRouter2ManagerTest { 
        assertThat(route1).isNotNull();

        assertThat(route2).isNotNull();



        mManager.selectRoute(mPackageName, route1);

        mManager.transfer(mPackageName, route1);

        assertThat(successLatch1.await(TIMEOUT_MS, TimeUnit.MILLISECONDS)).isTrue();

        mManager.selectRoute(mPackageName, route2);

        mManager.transfer(mPackageName, route2);

        assertThat(successLatch2.await(TIMEOUT_MS, TimeUnit.MILLISECONDS)).isTrue();



        // onTransferFailed/onSessionReleased should not be called.
@@ -703,7 +703,7 @@ public class MediaRouter2ManagerTest { 
            }

        });



        mManager.selectRoute(mPackageName, routes.get(ROUTE_ID1));

        mManager.transfer(mPackageName, routes.get(ROUTE_ID1));

        assertThat(onSessionCreatedLatch.await(TIMEOUT_MS, TimeUnit.MILLISECONDS)).isTrue();



        List<RoutingSessionInfo> sessions = mManager.getRoutingSessions(mPackageName);
@@ -858,7 +858,7 @@ public class MediaRouter2ManagerTest { 
        });



        mRouter2.setOnGetControllerHintsListener(listener);

        mManager.selectRoute(mPackageName, route);

        mManager.transfer(mPackageName, route);

        assertThat(hintLatch.await(TIMEOUT_MS, TimeUnit.MILLISECONDS)).isTrue();

        assertThat(successLatch.await(TIMEOUT_MS, TimeUnit.MILLISECONDS)).isTrue();
@@ -903,7 +903,7 @@ public class MediaRouter2ManagerTest { 
            }

        });



        mManager.selectRoute(mPackageName, routes.get(ROUTE_ID4_TO_SELECT_AND_DESELECT));

        mManager.transfer(mPackageName, routes.get(ROUTE_ID4_TO_SELECT_AND_DESELECT));

        assertThat(onSessionCreatedLatch.await(TIMEOUT_MS, TimeUnit.MILLISECONDS)).isTrue();

    }

packages/SettingsLib/src/com/android/settingslib/media/MediaDevice.java

+1 −1
Original line number Diff line number Diff line
@@ -293,7 +293,7 @@ public abstract class MediaDevice implements Comparable<MediaDevice> { 
            return false;

        }

        setConnectedRecord();

        mRouterManager.selectRoute(mPackageName, mRouteInfo);

        mRouterManager.transfer(mPackageName, mRouteInfo);

        return true;

    }

packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/MediaDeviceTest.java

+1 −1
Original line number Diff line number Diff line
@@ -461,7 +461,7 @@ public class MediaDeviceTest { 
    public void connect_shouldSelectRoute() {

        mInfoMediaDevice1.connect();



        verify(mMediaRouter2Manager).selectRoute(TEST_PACKAGE_NAME, mRouteInfo1);

        verify(mMediaRouter2Manager).transfer(TEST_PACKAGE_NAME, mRouteInfo1);

    }



    @Test