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

Commit e9244e2d authored by tim peng's avatar tim peng Committed by Automerger Merge Worker
Browse files

Merge "When only one device is selected in dynamic group, the device should be... 

Merge "When only one device is selected in dynamic group, the device should be disabled" into rvc-dev am: 7121bc89 am: 31278079 am: 70978e78 am: ac75d2e0

Change-Id: Ief575bba7d9959d7f41d1cc16b1f2507331ee13c
parents 86330a77 ac75d2e0

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

+5 −0
Original line number Diff line number Diff line
@@ -475,5 +475,10 @@ public class InfoMediaManager extends MediaManager { 
        public void onRequestFailed(int reason) {

            dispatchOnRequestFailed(reason);

        }



        @Override

        public void onSessionUpdated(RoutingSessionInfo sessionInfo) {

            dispatchDataChanged();

        }

    }

}

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

+9 −0
Original line number Diff line number Diff line
@@ -624,6 +624,15 @@ public class InfoMediaManagerTest { 
        verify(mCallback).onConnectedDeviceChanged(null);

    }



    @Test

    public void onSessionUpdated_shouldDispatchDataChanged() {

        mInfoMediaManager.registerCallback(mCallback);



        mInfoMediaManager.mMediaRouterCallback.onSessionUpdated(mock(RoutingSessionInfo.class));



        verify(mCallback).onDeviceAttributesChanged();

    }



    @Test

    public void addMediaDevice_verifyDeviceTypeCanCorrespondToMediaDevice() {

        final MediaRoute2Info route2Info = mock(MediaRoute2Info.class);