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

Commit 4ccdcfd6 authored May 14, 2020 by tim peng Committed by Automerger Merge Worker May 14, 2020

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

Change-Id: I9ccaccc91ad1cfa534467a6e1e88c8b7a26cc965

parents 68ba5e00 7121bc89

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

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -475,5 +475,10 @@ public class InfoMediaManager extends MediaManager {
	public void onRequestFailed(int reason) {		public void onRequestFailed(int reason) {
	dispatchOnRequestFailed(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	Original line	Diff line number	Diff line
	@@ -624,6 +624,15 @@ public class InfoMediaManagerTest {
	verify(mCallback).onConnectedDeviceChanged(null);		verify(mCallback).onConnectedDeviceChanged(null);
	}		}

			@Test
			public void onSessionUpdated_shouldDispatchDataChanged() {
			mInfoMediaManager.registerCallback(mCallback);

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

			verify(mCallback).onDeviceAttributesChanged();
			}

	@Test		@Test
	public void addMediaDevice_verifyDeviceTypeCanCorrespondToMediaDevice() {		public void addMediaDevice_verifyDeviceTypeCanCorrespondToMediaDevice() {
	final MediaRoute2Info route2Info = mock(MediaRoute2Info.class);		final MediaRoute2Info route2Info = mock(MediaRoute2Info.class);