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

Commit cf58d6b4 authored May 13, 2025 by Alexandr Shabalin Committed by Android (Google) Code Review May 13, 2025

Merge "Remove unused method MediaSwitchingController#isActiveItem." into main

parents 4c709a6d 7e9ac0d8

packages/SystemUI/src/com/android/systemui/media/dialog/MediaSwitchingController.java

+0 −9

Original line number	Original line	Diff line number	Diff line
	@@ -531,15 +531,6 @@ public class MediaSwitchingController
	return mIsGroupListCollapsed;		return mIsGroupListCollapsed;
	}		}

	boolean isActiveItem(MediaDevice device) {
	boolean isConnected = mLocalMediaManager.getCurrentConnectedDevice().getId().equals(
	device.getId());
	boolean isSelectedDeviceInGroup = getSelectedMediaDevice().size() > 1
	&& getSelectedMediaDevice().contains(device);
	return (!hasAdjustVolumeUserRestriction() && isConnected && !isAnyDeviceTransferring())
	\|\| isSelectedDeviceInGroup;
	}

	IconCompat getNotificationSmallIcon() {		IconCompat getNotificationSmallIcon() {
	if (TextUtils.isEmpty(mPackageName)) {		if (TextUtils.isEmpty(mPackageName)) {
	return null;		return null;

packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaSwitchingControllerTest.java

+0 −7

Original line number	Original line	Diff line number	Diff line
	@@ -798,13 +798,6 @@ public class MediaSwitchingControllerTest extends SysuiTestCase {
	assertThat(testMediaSwitchingController.getAppSourceName()).isNull();		assertThat(testMediaSwitchingController.getAppSourceName()).isNull();
	}		}

	@Test
	public void isActiveItem_deviceNotConnected_returnsFalse() {
	when(mLocalMediaManager.getCurrentConnectedDevice()).thenReturn(mMediaDevice2);

	assertThat(mMediaSwitchingController.isActiveItem(mMediaDevice1)).isFalse();
	}

	@Test		@Test
	public void getNotificationSmallIcon_packageNameIsNull_returnsNull() {		public void getNotificationSmallIcon_packageNameIsNull_returnsNull() {
	MediaSwitchingController testMediaSwitchingController =		MediaSwitchingController testMediaSwitchingController =