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

Commit 328765c3 authored by Iván Budnik's avatar Iván Budnik
Browse files

Remove unused connectDeviceWithoutPackageName method 

This is a non-functional change.

Test: atest com.android.settingslib.media
Bug: 291277292
Change-Id: I5b2cc911d24c5ad9d269895091101cebd2eb235d
parent f80c9e5d

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

+0 −5
Original line number Diff line number Diff line
@@ -161,11 +161,6 @@ public abstract class InfoMediaManager extends MediaManager { 


    protected abstract void startScanOnRouter();



    /**

     * Transfer MediaDevice for media without package name.

     */

    protected abstract boolean connectDeviceWithoutPackageName(@NonNull MediaDevice device);



    protected abstract void transferToRoute(@NonNull MediaRoute2Info route);



    protected abstract void selectRoute(

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

+0 −12
Original line number Diff line number Diff line
@@ -85,18 +85,6 @@ public class ManagerInfoMediaManager extends InfoMediaManager { 
        mRouterManager.transfer(mPackageName, route, android.os.Process.myUserHandle());

    }



    @Override

    protected boolean connectDeviceWithoutPackageName(@NonNull MediaDevice device) {

        final RoutingSessionInfo info = mRouterManager.getSystemRoutingSession(null);

        if (info != null) {

            // TODO: b/279555229 - provide real user handle and package name of a caller.

            mRouterManager.transfer(

                    info, device.mRouteInfo, android.os.Process.myUserHandle(), mPackageName);

            return true;

        }

        return false;

    }



    @Override

    protected void selectRoute(@NonNull MediaRoute2Info route, @NonNull RoutingSessionInfo info) {

        mRouterManager.selectRoute(info, route);

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

+0 −5
Original line number Diff line number Diff line
@@ -57,11 +57,6 @@ import java.util.List; 
        // Do nothing.

    }



    @Override

    protected boolean connectDeviceWithoutPackageName(@NonNull MediaDevice device) {

        return false;

    }



    @Override

    protected void transferToRoute(@NonNull MediaRoute2Info route) {

        // Do nothing.

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

+0 −11
Original line number Diff line number Diff line
@@ -113,17 +113,6 @@ public final class RouterInfoMediaManager extends InfoMediaManager { 
        mRouter.unregisterRouteCallback(mRouteCallback);

    }



    @Override

    protected boolean connectDeviceWithoutPackageName(@NonNull MediaDevice device) {

        if (device.mRouteInfo == null) {

            return false;

        }



        RoutingController controller = mRouter.getSystemController();

        mRouter.transfer(controller, device.mRouteInfo);

        return true;

    }



    @Override

    protected void transferToRoute(@NonNull MediaRoute2Info route) {

        mRouter.transferTo(route);

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

+0 −12
Original line number Diff line number Diff line
@@ -504,18 +504,6 @@ public class InfoMediaManagerTest { 
        return routes;

    }



    @Test

    public void connectDeviceWithoutPackageName_noSession_returnFalse() {

        final MediaRoute2Info info = mock(MediaRoute2Info.class);

        final MediaDevice device = new InfoMediaDevice(mContext, info);



        final List<RoutingSessionInfo> infos = new ArrayList<>();



        mShadowRouter2Manager.setRemoteSessions(infos);



        assertThat(mInfoMediaManager.connectDeviceWithoutPackageName(device)).isFalse();

    }



    @Test

    public void onRoutesRemoved_getAvailableRoutes_shouldAddMediaDevice() {

        final List<RoutingSessionInfo> routingSessionInfos = new ArrayList<>();