From ccc874da6dcea863474a0d82799d71cbe95563f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20Budnik?= Date: Fri, 14 Jul 2023 14:55:38 +0000 Subject: [PATCH] Inline shouldDisableMediaOutput to Settings app This change removes a MediaRouter2Manager dependency from SettingsLib. This is a non-functional change. Bug: 192657812 Test: Presubmit. Change-Id: If3179c58847e9c3e9d881f2d97bc39173e4359c5 --- .../settingslib/media/InfoMediaManager.java | 10 ---- .../settingslib/media/LocalMediaManager.java | 7 --- .../media/InfoMediaManagerTest.java | 47 ------------------- 3 files changed, 64 deletions(-) diff --git a/packages/SettingsLib/src/com/android/settingslib/media/InfoMediaManager.java b/packages/SettingsLib/src/com/android/settingslib/media/InfoMediaManager.java index 7a48838ced91b..bff51e32c1f98 100644 --- a/packages/SettingsLib/src/com/android/settingslib/media/InfoMediaManager.java +++ b/packages/SettingsLib/src/com/android/settingslib/media/InfoMediaManager.java @@ -496,16 +496,6 @@ public abstract class InfoMediaManager extends MediaManager { return info.getName(); } - boolean shouldDisableMediaOutput(String packageName) { - if (TextUtils.isEmpty(packageName)) { - Log.w(TAG, "shouldDisableMediaOutput() package name is null or empty!"); - return true; - } - - // Disable when there is no transferable route - return getTransferableRoutes(packageName).isEmpty(); - } - @TargetApi(Build.VERSION_CODES.R) boolean shouldEnableVolumeSeekBar(RoutingSessionInfo sessionInfo) { return sessionInfo.isSystemSession() // System sessions are not remote diff --git a/packages/SettingsLib/src/com/android/settingslib/media/LocalMediaManager.java b/packages/SettingsLib/src/com/android/settingslib/media/LocalMediaManager.java index 8479df1c76667..fd5ca847877fb 100644 --- a/packages/SettingsLib/src/com/android/settingslib/media/LocalMediaManager.java +++ b/packages/SettingsLib/src/com/android/settingslib/media/LocalMediaManager.java @@ -452,13 +452,6 @@ public class LocalMediaManager implements BluetoothCallback { return mPackageName; } - /** - * Returns {@code true} if needed to disable media output, otherwise returns {@code false}. - */ - public boolean shouldDisableMediaOutput(String packageName) { - return mInfoMediaManager.shouldDisableMediaOutput(packageName); - } - /** * Returns {@code true} if needed to enable volume seekbar, otherwise returns {@code false}. */ diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/InfoMediaManagerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/InfoMediaManagerTest.java index 45b5de4cf367a..866ef9d6076e7 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/InfoMediaManagerTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/InfoMediaManagerTest.java @@ -1083,51 +1083,4 @@ public class InfoMediaManagerTest { assertThat(device.getState()).isEqualTo(STATE_SELECTED); assertThat(mInfoMediaManager.getCurrentConnectedDevice()).isEqualTo(device); } - - @Test - public void shouldDisableMediaOutput_infosIsEmpty_returnsTrue() { - mShadowRouter2Manager.setTransferableRoutes(new ArrayList<>()); - - assertThat(mInfoMediaManager.shouldDisableMediaOutput("test")).isTrue(); - } - - @Test - public void shouldDisableMediaOutput_infosSizeEqual1_returnsFalse() { - final MediaRoute2Info info = mock(MediaRoute2Info.class); - final List infos = new ArrayList<>(); - infos.add(info); - mShadowRouter2Manager.setTransferableRoutes(infos); - - when(info.getType()).thenReturn(TYPE_REMOTE_SPEAKER); - - assertThat(mInfoMediaManager.shouldDisableMediaOutput("test")).isFalse(); - } - - @Test - public void shouldDisableMediaOutput_infosSizeEqual1AndNotCastDevice_returnsFalse() { - final MediaRoute2Info info = mock(MediaRoute2Info.class); - final List infos = new ArrayList<>(); - infos.add(info); - mShadowRouter2Manager.setTransferableRoutes(infos); - - when(info.getType()).thenReturn(TYPE_BUILTIN_SPEAKER); - - assertThat(mInfoMediaManager.shouldDisableMediaOutput("test")).isFalse(); - } - - - @Test - public void shouldDisableMediaOutput_infosSizeOverThan1_returnsFalse() { - final MediaRoute2Info info = mock(MediaRoute2Info.class); - final MediaRoute2Info info2 = mock(MediaRoute2Info.class); - final List infos = new ArrayList<>(); - infos.add(info); - infos.add(info2); - mShadowRouter2Manager.setTransferableRoutes(infos); - - when(info.getType()).thenReturn(TYPE_REMOTE_SPEAKER); - when(info2.getType()).thenReturn(TYPE_REMOTE_SPEAKER); - - assertThat(mInfoMediaManager.shouldDisableMediaOutput("test")).isFalse(); - } }