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

Commit f961f2ca authored by hughchen's avatar hughchen
Browse files

Update devices list when onRoutesChanged() called 

- Update devices list when onRoutesChanged() is called because
  when volume is changed the onRoutesChanged() also be called.
  We need to update devices list to let caller get correct
  volume value.
- Send onConnectedDeviceChanged() when onTransferred() is called.

Bug: 151709228
Test: make -j42 RunSettingsLibRoboTests
Change-Id: I64d14883123d7135537b6df01d24afc90db6849d
parent 8e9e4b44

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

+15 −13
Original line number Diff line number Diff line
@@ -338,7 +338,8 @@ public class InfoMediaManager extends MediaManager { 
    private void buildAllRoutes() {

        for (MediaRoute2Info route : mRouterManager.getAllRoutes()) {

            if (DEBUG) {

                Log.d(TAG, "buildAllRoutes() route : " + route.getName());

                Log.d(TAG, "buildAllRoutes() route : " + route.getName() + ", volume : "

                        + route.getVolume());

            }

            if (route.isSystemRoute()) {

                addMediaDevice(route);
@@ -414,18 +415,7 @@ public class InfoMediaManager extends MediaManager { 


        @Override

        public void onRoutesChanged(List<MediaRoute2Info> routes) {

            mMediaDevices.clear();

            mCurrentConnectedDevice = null;

            if (TextUtils.isEmpty(mPackageName)) {

                buildAllRoutes();

            } else {

                buildAvailableRoutes();

            }



            final String id = mCurrentConnectedDevice != null

                    ? mCurrentConnectedDevice.getId()

                    : null;

            dispatchConnectedDeviceChanged(id);

            refreshDevices();

        }



        @Override
@@ -439,6 +429,18 @@ public class InfoMediaManager extends MediaManager { 
                Log.d(TAG, "onTransferred() oldSession : " + oldSession.getName()

                        + ", newSession : " + newSession.getName());

            }

            mMediaDevices.clear();

            mCurrentConnectedDevice = null;

            if (TextUtils.isEmpty(mPackageName)) {

                buildAllRoutes();

            } else {

                buildAvailableRoutes();

            }



            final String id = mCurrentConnectedDevice != null

                    ? mCurrentConnectedDevice.getId()

                    : null;

            dispatchConnectedDeviceChanged(id);

        }



        @Override

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

+57 −6
Original line number Diff line number Diff line
@@ -173,8 +173,6 @@ public class InfoMediaManagerTest { 
        mShadowRouter2Manager.setRoutingSessions(routingSessionInfos);



        final MediaRoute2Info info = mock(MediaRoute2Info.class);

        mInfoMediaManager.registerCallback(mCallback);



        when(info.getId()).thenReturn(TEST_ID);

        when(info.getClientPackageName()).thenReturn(TEST_PACKAGE_NAME);
@@ -191,14 +189,11 @@ public class InfoMediaManagerTest { 
        assertThat(infoDevice.getId()).isEqualTo(TEST_ID);

        assertThat(mInfoMediaManager.getCurrentConnectedDevice()).isEqualTo(infoDevice);

        assertThat(mInfoMediaManager.mMediaDevices).hasSize(routes.size());

        verify(mCallback).onConnectedDeviceChanged(TEST_ID);

    }



    @Test

    public void onRoutesChanged_buildAllRoutes_shouldAddMediaDevice() {

        final MediaRoute2Info info = mock(MediaRoute2Info.class);

        mInfoMediaManager.registerCallback(mCallback);



        when(info.getId()).thenReturn(TEST_ID);

        when(info.getClientPackageName()).thenReturn(TEST_PACKAGE_NAME);

        when(info.isSystemRoute()).thenReturn(true);
@@ -216,7 +211,6 @@ public class InfoMediaManagerTest { 
        final MediaDevice infoDevice = mInfoMediaManager.mMediaDevices.get(0);

        assertThat(infoDevice.getId()).isEqualTo(TEST_ID);

        assertThat(mInfoMediaManager.mMediaDevices).hasSize(routes.size());

        verify(mCallback).onConnectedDeviceChanged(null);

    }



    @Test
@@ -550,4 +544,61 @@ public class InfoMediaManagerTest { 


        verify(mCallback).onRequestFailed(REASON_NETWORK_ERROR);

    }



    @Test

    public void onTransferred_getAvailableRoutes_shouldAddMediaDevice() {

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

        final RoutingSessionInfo sessionInfo = mock(RoutingSessionInfo.class);

        routingSessionInfos.add(sessionInfo);

        final List<String> selectedRoutes = new ArrayList<>();

        selectedRoutes.add(TEST_ID);

        when(sessionInfo.getSelectedRoutes()).thenReturn(selectedRoutes);

        mShadowRouter2Manager.setRoutingSessions(routingSessionInfos);



        final MediaRoute2Info info = mock(MediaRoute2Info.class);

        mInfoMediaManager.registerCallback(mCallback);



        when(info.getId()).thenReturn(TEST_ID);

        when(info.getClientPackageName()).thenReturn(TEST_PACKAGE_NAME);



        final List<MediaRoute2Info> routes = new ArrayList<>();

        routes.add(info);

        mShadowRouter2Manager.setAvailableRoutes(routes);



        final MediaDevice mediaDevice = mInfoMediaManager.findMediaDevice(TEST_ID);

        assertThat(mediaDevice).isNull();



        mInfoMediaManager.mMediaRouterCallback.onTransferred(null, null);



        final MediaDevice infoDevice = mInfoMediaManager.mMediaDevices.get(0);

        assertThat(infoDevice.getId()).isEqualTo(TEST_ID);

        assertThat(mInfoMediaManager.getCurrentConnectedDevice()).isEqualTo(infoDevice);

        assertThat(mInfoMediaManager.mMediaDevices).hasSize(routes.size());

        verify(mCallback).onConnectedDeviceChanged(TEST_ID);

    }



    @Test

    public void onTransferred_buildAllRoutes_shouldAddMediaDevice() {

        final MediaRoute2Info info = mock(MediaRoute2Info.class);

        mInfoMediaManager.registerCallback(mCallback);



        when(info.getId()).thenReturn(TEST_ID);

        when(info.getClientPackageName()).thenReturn(TEST_PACKAGE_NAME);

        when(info.isSystemRoute()).thenReturn(true);



        final List<MediaRoute2Info> routes = new ArrayList<>();

        routes.add(info);

        mShadowRouter2Manager.setAllRoutes(routes);



        final MediaDevice mediaDevice = mInfoMediaManager.findMediaDevice(TEST_ID);

        assertThat(mediaDevice).isNull();



        mInfoMediaManager.mPackageName = "";

        mInfoMediaManager.mMediaRouterCallback.onTransferred(null, null);



        final MediaDevice infoDevice = mInfoMediaManager.mMediaDevices.get(0);

        assertThat(infoDevice.getId()).isEqualTo(TEST_ID);

        assertThat(mInfoMediaManager.mMediaDevices).hasSize(routes.size());

        verify(mCallback).onConnectedDeviceChanged(null);

    }

}