Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Inline shouldDisableMediaOutput to Settings app" into main

Browse Source
This commit is contained in:
Iván Budnik
2023-07-18 14:31:50 +00:00
committed by Android (Google) Code Review
parent a71e442908 ccc874da6d
commit 8602b5f48f
3 changed files with 0 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/SettingsLib/src/com/android/settingslib/media/InfoMediaManager.java
View File

@@ -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

7
packages/SettingsLib/src/com/android/settingslib/media/LocalMediaManager.java
View File

@@ -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}.
*/

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

@@ -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<MediaRoute2Info> 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<MediaRoute2Info> 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<MediaRoute2Info> 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();
}
}