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

Commit cb715528 authored by Iván Budnik's avatar Iván Budnik Committed by Android (Google) Code Review
Browse files

Merge "Remove empty method" into main

parents cdde529a ca2e4d6a

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

+0 −4
Original line number Diff line number Diff line
@@ -184,10 +184,6 @@ public class LocalMediaManager implements BluetoothCallback { 
            return false;

        }



        if (mCurrentConnectedDevice != null) {

            mCurrentConnectedDevice.disconnect();

        }



        device.setState(MediaDeviceState.STATE_CONNECTING);

        mInfoMediaManager.connectToDevice(device);

        return true;

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

+0 −6
Original line number Diff line number Diff line
@@ -395,12 +395,6 @@ public abstract class MediaDevice implements Comparable<MediaDevice> { 
        return mRouteInfo.getVolumeHandling() == MediaRoute2Info.PLAYBACK_VOLUME_FIXED;

    }



    /**

     * Stop transfer MediaDevice

     */

    public void disconnect() {

    }



    /**

     * Set current device's state

     */

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

+0 −1
Original line number Diff line number Diff line
@@ -147,7 +147,6 @@ public class LocalMediaManagerTest { 
        mLocalMediaManager.registerCallback(mCallback);

        assertThat(mLocalMediaManager.connectDevice(device)).isTrue();



        verify(currentDevice).disconnect();

        verify(mInfoMediaManager).connectToDevice(device);

    }