PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix output switcher will show 2 media session in some use cases"

Browse Source
This commit is contained in:
TreeHugger Robot
2020-10-19 04:12:50 +00:00
committed by Android (Google) Code Review
parent 42a891460e 3a7293cbbf
commit ccccc79043
2 changed files with 36 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/media/MediaOutputUtils.java
View File

@@ -25,6 +25,9 @@ import androidx.annotation.Nullable;
import com.android.settings.sound.MediaOutputPreferenceController; import com.android.settings.sound.MediaOutputPreferenceController;
import java.util.ArrayList;
import java.util.List;
/** /**
* Utilities that can be shared between {@link MediaOutputIndicatorWorker} and * Utilities that can be shared between {@link MediaOutputIndicatorWorker} and
* {@link MediaOutputPreferenceController}. * {@link MediaOutputPreferenceController}.
@@ -43,6 +46,7 @@ public class MediaOutputUtils {
MediaSessionManager mediaSessionManager) { MediaSessionManager mediaSessionManager) {
MediaController localController = null; MediaController localController = null;
final List<String> remoteMediaSessionLists = new ArrayList<>();
for (MediaController controller : mediaSessionManager.getActiveSessions(null)) { for (MediaController controller : mediaSessionManager.getActiveSessions(null)) {
final MediaController.PlaybackInfo pi = controller.getPlaybackInfo(); final MediaController.PlaybackInfo pi = controller.getPlaybackInfo();
if (pi == null) { if (pi == null) {
@@ -69,10 +73,14 @@ public class MediaOutputUtils {
controller.getPackageName())) { controller.getPackageName())) {
localController = null; localController = null;
} }
if (!remoteMediaSessionLists.contains(controller.getPackageName())) {
remoteMediaSessionLists.add(controller.getPackageName());
}
continue; continue;
} }
if (pi.getPlaybackType() == MediaController.PlaybackInfo.PLAYBACK_TYPE_LOCAL) { if (pi.getPlaybackType() == MediaController.PlaybackInfo.PLAYBACK_TYPE_LOCAL) {
if (localController == null) { if (localController == null
&& !remoteMediaSessionLists.contains(controller.getPackageName())) {
localController = controller; localController = controller;
} }
} }

27
tests/robotests/src/com/android/settings/media/MediaOutputUtilsTest.java
View File

@@ -115,6 +115,33 @@ public class MediaOutputUtilsTest {
@Test @Test
public void getActiveLocalMediaController_bothHaveRemoteMediaAndLocalMedia_returnNull() { public void getActiveLocalMediaController_bothHaveRemoteMediaAndLocalMedia_returnNull() {
mMediaControllers.clear();
final MediaController.PlaybackInfo playbackInfo = new MediaController.PlaybackInfo(
MediaController.PlaybackInfo.PLAYBACK_TYPE_REMOTE,
VolumeProvider.VOLUME_CONTROL_ABSOLUTE,
100,
10,
new AudioAttributes.Builder().setUsage(AudioAttributes.USAGE_MEDIA).build(),
null);
final PlaybackState playbackState = new PlaybackState.Builder()
.setState(PlaybackState.STATE_PLAYING, 0, 1)
.build();
final MediaController remoteMediaController = mock(MediaController.class);
mMediaControllers.add(remoteMediaController);
mMediaControllers.add(mMediaController);
initPlayback();
when(mMediaController.getPlaybackInfo()).thenReturn(mPlaybackInfo);
when(mMediaController.getPlaybackState()).thenReturn(mPlaybackState);
when(remoteMediaController.getPlaybackInfo()).thenReturn(playbackInfo);
when(remoteMediaController.getPlaybackState()).thenReturn(playbackState);
assertThat(MediaOutputUtils.getActiveLocalMediaController(mMediaSessionManager)).isNull();
}
@Test
public void getActiveLocalMediaController_bothHaveLocalMediaAndRemoteMedia_returnNull() {
final MediaController.PlaybackInfo playbackInfo = new MediaController.PlaybackInfo( final MediaController.PlaybackInfo playbackInfo = new MediaController.PlaybackInfo(
MediaController.PlaybackInfo.PLAYBACK_TYPE_REMOTE, MediaController.PlaybackInfo.PLAYBACK_TYPE_REMOTE,
VolumeProvider.VOLUME_CONTROL_ABSOLUTE, VolumeProvider.VOLUME_CONTROL_ABSOLUTE,