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

Commit a22153dd authored by Anton Potapov's avatar Anton Potapov
Browse files

Prefer active MediaController for MediaOutputInteractor#activeMediaController. 

Flag: aconfig new_volume_panel NEXTFOOD
Test: atest MediaOutputInteractorTest
Test: atest MediaDeviceSessionInteractorTest
Fixes: 329561499
Change-Id: Id6b207a0f96e473430ab678b45ec39ba28f43e17
parent 72c37464

packages/SettingsLib/src/com/android/settingslib/media/session/MediaSessionManagerExt.kt

+3 −4
Original line number Diff line number Diff line
@@ -45,14 +45,13 @@ val MediaSessionManager.activeMediaChanges: Flow<List<MediaController>?> 
            .buffer(capacity = Channel.CONFLATED)



/** [Flow] for [MediaSessionManager.RemoteSessionCallback]. */

val MediaSessionManager.remoteSessionChanges: Flow<MediaSession.Token?>

val MediaSessionManager.defaultRemoteSessionChanged: Flow<MediaSession.Token?>

    get() =

        callbackFlow {

                val callback =

                    object : MediaSessionManager.RemoteSessionCallback {

                        override fun onVolumeChanged(sessionToken: MediaSession.Token, flags: Int) {

                            launch { send(sessionToken) }

                        }

                        override fun onVolumeChanged(sessionToken: MediaSession.Token, flags: Int) =

                            Unit



                        override fun onDefaultRemoteSessionChanged(

                            sessionToken: MediaSession.Token?

packages/SettingsLib/src/com/android/settingslib/volume/data/repository/MediaControllerRepository.kt

+4 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.media.session.MediaSessionManager 
import com.android.settingslib.bluetooth.LocalBluetoothManager

import com.android.settingslib.bluetooth.headsetAudioModeChanges

import com.android.settingslib.media.session.activeMediaChanges

import com.android.settingslib.media.session.defaultRemoteSessionChanged

import com.android.settingslib.volume.shared.AudioManagerEventsReceiver

import com.android.settingslib.volume.shared.model.AudioManagerEvent

import kotlin.coroutines.CoroutineContext
@@ -59,6 +60,9 @@ class MediaControllerRepositoryImpl( 


    override val activeSessions: StateFlow<List<MediaController>> =

        merge(

                mediaSessionManager.defaultRemoteSessionChanged.map {

                    mediaSessionManager.getActiveSessions(null)

                },

                mediaSessionManager.activeMediaChanges.filterNotNull(),

                localBluetoothManager?.headsetAudioModeChanges?.map {

                    mediaSessionManager.getActiveSessions(null)

packages/SystemUI/multivalentTests/src/com/android/systemui/volume/domain/interactor/AudioOutputInteractorTest.kt

+2 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.graphics.drawable.TestStubDrawable 
import android.media.AudioDeviceInfo

import android.media.AudioDevicePort

import android.media.AudioManager

import android.testing.TestableLooper

import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.filters.SmallTest

import com.android.settingslib.R
@@ -54,6 +55,7 @@ import org.junit.runner.RunWith 
@OptIn(ExperimentalCoroutinesApi::class)

@RunWith(AndroidJUnit4::class)

@SmallTest

@TestableLooper.RunWithLooper(setAsMainLooper = true)

class AudioOutputInteractorTest : SysuiTestCase() {



    private val kosmos = testKosmos()

packages/SystemUI/multivalentTests/src/com/android/systemui/volume/panel/component/mediaoutput/domain/interactor/MediaOutputInteractorTest.kt

0 → 100644
+231 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2024 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.systemui.volume.panel.component.mediaoutput.domain.interactor



import android.media.AudioAttributes

import android.media.VolumeProvider

import android.media.session.MediaController

import android.media.session.PlaybackState

import android.testing.TestableLooper

import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.filters.SmallTest

import com.android.systemui.SysuiTestCase

import com.android.systemui.coroutines.collectLastValue

import com.android.systemui.kosmos.testScope

import com.android.systemui.testKosmos

import com.android.systemui.util.mockito.mock

import com.android.systemui.util.mockito.whenever

import com.android.systemui.volume.data.repository.FakeLocalMediaRepository

import com.android.systemui.volume.localMediaController

import com.android.systemui.volume.localMediaRepositoryFactory

import com.android.systemui.volume.localPlaybackInfo

import com.android.systemui.volume.localPlaybackStateBuilder

import com.android.systemui.volume.mediaControllerRepository

import com.android.systemui.volume.mediaOutputInteractor

import com.android.systemui.volume.panel.component.mediaoutput.shared.model.MediaDeviceSession

import com.android.systemui.volume.panel.shared.model.Result

import com.android.systemui.volume.remoteMediaController

import com.android.systemui.volume.remotePlaybackInfo

import com.android.systemui.volume.remotePlaybackStateBuilder

import com.google.common.truth.Truth.assertThat

import kotlinx.coroutines.ExperimentalCoroutinesApi

import kotlinx.coroutines.test.runCurrent

import kotlinx.coroutines.test.runTest

import org.junit.Before

import org.junit.Test

import org.junit.runner.RunWith



@OptIn(ExperimentalCoroutinesApi::class)

@SmallTest

@RunWith(AndroidJUnit4::class)

@TestableLooper.RunWithLooper(setAsMainLooper = true)

class MediaOutputInteractorTest : SysuiTestCase() {



    private val kosmos = testKosmos()



    private lateinit var underTest: MediaOutputInteractor



    @Before

    fun setUp() =

        with(kosmos) {

            localMediaRepositoryFactory.setLocalMediaRepository(

                "local.test.pkg",

                FakeLocalMediaRepository().apply {

                    updateCurrentConnectedDevice(

                        mock { whenever(name).thenReturn("local_media_device") }

                    )

                },

            )

            localMediaRepositoryFactory.setLocalMediaRepository(

                "remote.test.pkg",

                FakeLocalMediaRepository().apply {

                    updateCurrentConnectedDevice(

                        mock { whenever(name).thenReturn("remote_media_device") }

                    )

                },

            )



            underTest = kosmos.mediaOutputInteractor

        }



    @Test

    fun noActiveMediaDeviceSessions_nulls() =

        with(kosmos) {

            testScope.runTest {

                mediaControllerRepository.setActiveSessions(emptyList())



                val activeMediaDeviceSessions by

                    collectLastValue(underTest.activeMediaDeviceSessions)

                runCurrent()



                assertThat(activeMediaDeviceSessions!!.local).isNull()

                assertThat(activeMediaDeviceSessions!!.remote).isNull()

            }

        }



    @Test

    fun activeMediaDeviceSessions_areParsed() =

        with(kosmos) {

            testScope.runTest {

                mediaControllerRepository.setActiveSessions(

                    listOf(localMediaController, remoteMediaController)

                )



                val activeMediaDeviceSessions by

                    collectLastValue(underTest.activeMediaDeviceSessions)

                runCurrent()



                with(activeMediaDeviceSessions!!.local!!) {

                    assertThat(packageName).isEqualTo("local.test.pkg")

                    assertThat(appLabel).isEqualTo("local_media_controller_label")

                    assertThat(canAdjustVolume).isTrue()

                }

                with(activeMediaDeviceSessions!!.remote!!) {

                    assertThat(packageName).isEqualTo("remote.test.pkg")

                    assertThat(appLabel).isEqualTo("remote_media_controller_label")

                    assertThat(canAdjustVolume).isTrue()

                }

            }

        }



    @Test

    fun activeMediaDeviceSessions_volumeControlFixed_cantAdjustVolume() =

        with(kosmos) {

            testScope.runTest {

                localPlaybackInfo =

                    MediaController.PlaybackInfo(

                        MediaController.PlaybackInfo.PLAYBACK_TYPE_LOCAL,

                        VolumeProvider.VOLUME_CONTROL_FIXED,

                        0,

                        0,

                        AudioAttributes.Builder().build(),

                        "",

                    )

                remotePlaybackInfo =

                    MediaController.PlaybackInfo(

                        MediaController.PlaybackInfo.PLAYBACK_TYPE_REMOTE,

                        VolumeProvider.VOLUME_CONTROL_FIXED,

                        0,

                        0,

                        AudioAttributes.Builder().build(),

                        "",

                    )

                mediaControllerRepository.setActiveSessions(

                    listOf(localMediaController, remoteMediaController)

                )



                val activeMediaDeviceSessions by

                    collectLastValue(underTest.activeMediaDeviceSessions)

                runCurrent()



                assertThat(activeMediaDeviceSessions!!.local!!.canAdjustVolume).isFalse()

                assertThat(activeMediaDeviceSessions!!.remote!!.canAdjustVolume).isFalse()

            }

        }



    @Test

    fun activeLocalAndRemoteSession_defaultSession_local() =

        with(kosmos) {

            testScope.runTest {

                localPlaybackStateBuilder.setState(PlaybackState.STATE_PLAYING, 0, 0f)

                remotePlaybackStateBuilder.setState(PlaybackState.STATE_PLAYING, 0, 0f)

                mediaControllerRepository.setActiveSessions(

                    listOf(localMediaController, remoteMediaController)

                )



                val defaultActiveMediaSession by

                    collectLastValue(underTest.defaultActiveMediaSession)

                val currentDevice by collectLastValue(underTest.currentConnectedDevice)

                runCurrent()



                with((defaultActiveMediaSession as Result.Data<MediaDeviceSession?>).data!!) {

                    assertThat(packageName).isEqualTo("local.test.pkg")

                    assertThat(appLabel).isEqualTo("local_media_controller_label")

                    assertThat(canAdjustVolume).isTrue()

                }

                assertThat(currentDevice!!.name).isEqualTo("local_media_device")

            }

        }



    @Test

    fun activeRemoteSession_defaultSession_remote() =

        with(kosmos) {

            testScope.runTest {

                localPlaybackStateBuilder.setState(PlaybackState.STATE_PAUSED, 0, 0f)

                remotePlaybackStateBuilder.setState(PlaybackState.STATE_PLAYING, 0, 0f)

                mediaControllerRepository.setActiveSessions(

                    listOf(localMediaController, remoteMediaController)

                )



                val defaultActiveMediaSession by

                    collectLastValue(underTest.defaultActiveMediaSession)

                val currentDevice by collectLastValue(underTest.currentConnectedDevice)

                runCurrent()



                with((defaultActiveMediaSession as Result.Data<MediaDeviceSession?>).data!!) {

                    assertThat(packageName).isEqualTo("remote.test.pkg")

                    assertThat(appLabel).isEqualTo("remote_media_controller_label")

                    assertThat(canAdjustVolume).isTrue()

                }

                assertThat(currentDevice!!.name).isEqualTo("remote_media_device")

            }

        }



    @Test

    fun inactiveLocalAndRemoteSession_defaultSession_local() =

        with(kosmos) {

            testScope.runTest {

                localPlaybackStateBuilder.setState(PlaybackState.STATE_PAUSED, 0, 0f)

                remotePlaybackStateBuilder.setState(PlaybackState.STATE_PAUSED, 0, 0f)

                mediaControllerRepository.setActiveSessions(

                    listOf(localMediaController, remoteMediaController)

                )



                val defaultActiveMediaSession by

                    collectLastValue(underTest.defaultActiveMediaSession)

                val currentDevice by collectLastValue(underTest.currentConnectedDevice)

                runCurrent()



                with((defaultActiveMediaSession as Result.Data<MediaDeviceSession?>).data!!) {

                    assertThat(packageName).isEqualTo("local.test.pkg")

                    assertThat(appLabel).isEqualTo("local_media_controller_label")

                    assertThat(canAdjustVolume).isTrue()

                }

                assertThat(currentDevice!!.name).isEqualTo("local_media_device")

            }

        }

}

packages/SystemUI/src/com/android/systemui/volume/domain/interactor/AudioOutputInteractor.kt

+3 −9
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ import com.android.systemui.volume.domain.model.AudioOutputDevice 
import com.android.systemui.volume.panel.component.mediaoutput.data.repository.LocalMediaRepositoryFactory

import com.android.systemui.volume.panel.component.mediaoutput.domain.interactor.MediaOutputInteractor

import com.android.systemui.volume.panel.dagger.scope.VolumePanelScope

import com.android.systemui.volume.panel.shared.model.filterData

import javax.inject.Inject

import kotlin.coroutines.CoroutineContext

import kotlinx.coroutines.CoroutineScope
@@ -69,14 +68,9 @@ constructor( 
                        communicationDevice?.toAudioOutputDevice()

                    }

                } else {

                    mediaOutputInteractor.defaultActiveMediaSession

                        .filterData()

                        .flatMapLatest {

                            localMediaRepositoryFactory

                                .create(it?.packageName)

                                .currentConnectedDevice

                    mediaOutputInteractor.currentConnectedDevice.map { mediaDevice ->

                        mediaDevice?.toAudioOutputDevice()

                    }

                        .map { mediaDevice -> mediaDevice?.toAudioOutputDevice() }

                }

            }

            .map { it ?: AudioOutputDevice.Unknown }