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

Commit e151950a authored by Alex Shabalin's avatar Alex Shabalin Committed by Alexandr Shabalin
Browse files

Clean up code for the flag `use_playback_info_for_routing_controls`. 

Fix: 409611629
Flag: EXEMPT removing flag use_playback_info_for_routing_controls
Test: atest com.android.settingslib.media.InfoMediaManagerTest,
atest com.android.systemui.media.dialog.MediaSwitchingControllerTest,
atest com.android.systemui.media.controls.domain.pipeline.MediaDeviceManagerTest

Change-Id: I67aa2a62b4ebefcebc02fc06b181acee4d4846ae
parent 691fc849

packages/SettingsLib/aconfig/settingslib_media_flag_declarations.aconfig

+0 −11
Original line number Diff line number Diff line
@@ -31,14 +31,3 @@ flag { 
        purpose: PURPOSE_BUGFIX

    }

}
 


flag {

    name: "use_playback_info_for_routing_controls"

    namespace: "media_solutions"

    description: "Use app-provided playback info when providing media routing information."

    bug: "333564788"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}

packages/SettingsLib/src/com/android/settingslib/media/InfoMediaManager.java

+2 −2
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ public abstract class InfoMediaManager { 
            @Nullable MediaSession.Token token) {

        MediaController mediaController = null;



        if (Flags.usePlaybackInfoForRoutingControls() && token != null) {

        if (token != null) {

            mediaController = new MediaController(context, token);

        }
@@ -490,7 +490,7 @@ public abstract class InfoMediaManager { 
        RoutingSessionInfo activeSession = sessions.get(sessions.size() - 1);



        // Logic from MediaRouter2Manager#getRoutingSessionForMediaController

        if (!Flags.usePlaybackInfoForRoutingControls() || mMediaController == null) {

        if (mMediaController == null) {

            return activeSession;

        }

packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/MediaDeviceManager.kt

+1 −30
Original line number Diff line number Diff line
@@ -395,7 +395,7 @@ constructor( 
        private fun updateCurrent() {

            if (isLeAudioBroadcastEnabled()) {

                current = getLeAudioBroadcastDeviceData()

            } else if (Flags.usePlaybackInfoForRoutingControls()) {

            } else {

                val activeDevice: MediaDeviceData?



                // LocalMediaManager provides the connected device based on PlaybackInfo.
@@ -442,35 +442,6 @@ constructor( 


                current = activeDevice ?: EMPTY_AND_DISABLED_MEDIA_DEVICE_DATA

                logger.logNewDeviceName(current?.name?.toString())

            } else {

                val aboutToConnect = aboutToConnectDeviceOverride

                if (

                    aboutToConnect != null &&

                        aboutToConnect.fullMediaDevice == null &&

                        aboutToConnect.backupMediaDeviceData != null

                ) {

                    // Only use [backupMediaDeviceData] when we don't have [fullMediaDevice].

                    current = aboutToConnect.backupMediaDeviceData

                    return

                }

                val device =

                    aboutToConnect?.fullMediaDevice ?: localMediaManager.currentConnectedDevice

                val routingSession =

                    controller?.let { mr2manager.get().getRoutingSessionForMediaController(it) }



                // If we have a controller but get a null route, then don't trust the device

                val enabled = device != null && (controller == null || routingSession != null)



                val name = getDeviceName(device, routingSession)

                logger.logNewDeviceName(name)

                current =

                    MediaDeviceData(

                        enabled,

                        device?.iconWithoutBackground,

                        name,

                        id = device?.id,

                        showBroadcastButton = false,

                    )

            }

        }

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

+1 −2
Original line number Diff line number Diff line
@@ -310,8 +310,7 @@ public class MediaSwitchingController 
    }



    private MediaController getMediaController() {

        if (mToken != null

                && com.android.settingslib.media.flags.Flags.usePlaybackInfoForRoutingControls()) {

        if (mToken != null) {

            return new MediaController(mContext, mToken);

        } else {

            for (NotificationEntry entry : mNotifCollection.getAllNotifs()) {

packages/SystemUI/tests/src/com/android/systemui/media/controls/domain/pipeline/MediaDeviceManagerTest.kt

+0 −95
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ import android.media.session.MediaController.PlaybackInfo 
import android.media.session.MediaSession

import android.platform.test.annotations.DisableFlags

import android.platform.test.annotations.EnableFlags

import android.platform.test.annotations.RequiresFlagsDisabled

import android.platform.test.annotations.RequiresFlagsEnabled

import android.platform.test.flag.junit.DeviceFlagsValueProvider

import android.platform.test.flag.junit.FlagsParameterization
@@ -44,8 +43,6 @@ import com.android.settingslib.flags.Flags 
import com.android.settingslib.media.InfoMediaManager.SuggestedDeviceState

import com.android.settingslib.media.LocalMediaManager

import com.android.settingslib.media.MediaDevice

import com.android.settingslib.media.PhoneMediaDevice

import com.android.settingslib.media.flags.Flags.FLAG_USE_PLAYBACK_INFO_FOR_ROUTING_CONTROLS

import com.android.systemui.Flags.FLAG_ENABLE_SUGGESTED_DEVICE_UI

import com.android.systemui.SysuiTestCase

import com.android.systemui.media.controls.MediaTestUtils
@@ -487,20 +484,6 @@ public class MediaDeviceManagerTest(flags: FlagsParameterization) : SysuiTestCas 
        assertThat(secondData.icon).isEqualTo(firstData.icon)

    }



    @RequiresFlagsDisabled(FLAG_USE_PLAYBACK_INFO_FOR_ROUTING_CONTROLS)

    @Test

    fun onMediaDataLoaded_withRemotePlaybackInfo_noMatchingRoutingSession_setsDisabledDevice() {

        // GIVEN that MR2Manager returns null for routing session

        whenever(playbackInfo.playbackType).thenReturn(PlaybackInfo.PLAYBACK_TYPE_REMOTE)

        whenever(mr2.getRoutingSessionForMediaController(any())).thenReturn(null)

        // WHEN a notification is added

        // THEN the device is disabled and name is set to null

        val data = loadMediaAndCaptureDeviceData()

        assertThat(data.enabled).isFalse()

        assertThat(data.name).isNull()

    }



    @RequiresFlagsEnabled(FLAG_USE_PLAYBACK_INFO_FOR_ROUTING_CONTROLS)

    @Test

    fun onMediaDataLoaded_withRemotePlaybackInfo_noMatchingRoutingSession_returnsOtherDevice() {

        // GIVEN that MR2Manager returns null for routing session
@@ -515,7 +498,6 @@ public class MediaDeviceManagerTest(flags: FlagsParameterization) : SysuiTestCas 
    }



    @Test

    @RequiresFlagsEnabled(FLAG_USE_PLAYBACK_INFO_FOR_ROUTING_CONTROLS)

    fun onMediaDataLoaded_withRemotePlaybackInfo_noMatchingRoutingSession() {

        whenever(playbackInfo.playbackType).thenReturn(PlaybackInfo.PLAYBACK_TYPE_REMOTE)

        whenever(mr2.getRoutingSessionForMediaController(any())).thenReturn(null)
@@ -528,27 +510,6 @@ public class MediaDeviceManagerTest(flags: FlagsParameterization) : SysuiTestCas 
        assertThat(secondData.icon).isEqualTo(firstData.icon)

    }



    @RequiresFlagsDisabled(FLAG_USE_PLAYBACK_INFO_FOR_ROUTING_CONTROLS)

    @Test

    fun onSelectedDeviceStateChanged_withRemotePlaybackInfo_noMatchingRoutingSession_setsDisabledDevice() {

        // GIVEN a notif is added

        loadMediaAndCaptureDeviceData()

        reset(listener)

        // AND MR2Manager returns null for routing session

        whenever(playbackInfo.playbackType).thenReturn(PlaybackInfo.PLAYBACK_TYPE_REMOTE)

        whenever(mr2.getRoutingSessionForMediaController(any())).thenReturn(null)

        // WHEN the selected device changes state

        val deviceCallback = captureCallback()

        deviceCallback.onSelectedDeviceStateChanged(device, 1)

        fakeBgExecutor.runAllReady()

        fakeFgExecutor.runAllReady()

        // THEN the device is disabled and name is set to null

        val data = captureDeviceData(KEY)

        assertThat(data.enabled).isFalse()

        assertThat(data.name).isNull()

    }



    @RequiresFlagsEnabled(FLAG_USE_PLAYBACK_INFO_FOR_ROUTING_CONTROLS)

    @Test

    fun onSelectedDeviceStateChanged_withRemotePlaybackInfo_noMatchingRoutingSession_returnOtherDevice() {

        // GIVEN a notif is added
@@ -569,27 +530,6 @@ public class MediaDeviceManagerTest(flags: FlagsParameterization) : SysuiTestCas 
        assertThat(data.icon).isEqualTo(OTHER_DEVICE_ICON_STUB)

    }



    @RequiresFlagsDisabled(FLAG_USE_PLAYBACK_INFO_FOR_ROUTING_CONTROLS)

    @Test

    fun onDeviceListUpdate_withRemotePlaybackInfo_noMatchingRoutingSession_setsDisabledDevice() {

        // GIVEN a notif is added

        loadMediaAndCaptureDeviceData()

        reset(listener)

        // GIVEN that MR2Manager returns null for routing session

        whenever(playbackInfo.playbackType).thenReturn(PlaybackInfo.PLAYBACK_TYPE_REMOTE)

        whenever(mr2.getRoutingSessionForMediaController(any())).thenReturn(null)

        // WHEN the selected device changes state

        val deviceCallback = captureCallback()

        deviceCallback.onDeviceListUpdate(mutableListOf(device))

        fakeBgExecutor.runAllReady()

        fakeFgExecutor.runAllReady()

        // THEN the device is disabled and name is set to null

        val data = captureDeviceData(KEY)

        assertThat(data.enabled).isFalse()

        assertThat(data.name).isNull()

    }



    @RequiresFlagsEnabled(FLAG_USE_PLAYBACK_INFO_FOR_ROUTING_CONTROLS)

    @Test

    fun onDeviceListUpdate_withRemotePlaybackInfo_noMatchingRoutingSession_returnsOtherDevice() {

        // GIVEN a notif is added
@@ -610,41 +550,6 @@ public class MediaDeviceManagerTest(flags: FlagsParameterization) : SysuiTestCas 
        assertThat(data.icon).isEqualTo(OTHER_DEVICE_ICON_STUB)

    }



    // With the flag enabled, MediaDeviceManager no longer gathers device name information directly.

    @RequiresFlagsDisabled(FLAG_USE_PLAYBACK_INFO_FOR_ROUTING_CONTROLS)

    @Test

    fun mr2ReturnsSystemRouteWithNullName_isPhone_usePhoneName() {

        // When the routing session name is null, and is a system session for a PhoneMediaDevice

        val phoneDevice = mock(PhoneMediaDevice::class.java)

        whenever(phoneDevice.iconWithoutBackground).thenReturn(icon)

        whenever(lmm.currentConnectedDevice).thenReturn(phoneDevice)

        whenever(routingSession.isSystemSession).thenReturn(true)



        whenever(routingSession.name).thenReturn(null)

        whenever(mr2.getSelectedRoutes(any())).thenReturn(listOf(selectedRoute))

        whenever(selectedRoute.name).thenReturn(REMOTE_DEVICE_NAME)

        whenever(selectedRoute.type).thenReturn(MediaRoute2Info.TYPE_BUILTIN_SPEAKER)



        // Then the device name is the PhoneMediaDevice string

        val data = loadMediaAndCaptureDeviceData()

        assertThat(data.name).isEqualTo(PhoneMediaDevice.getMediaTransferThisDeviceName(context))

    }



    // With the flag enabled, MediaDeviceManager no longer gathers device name information directly.

    @RequiresFlagsDisabled(FLAG_USE_PLAYBACK_INFO_FOR_ROUTING_CONTROLS)

    @Test

    fun mr2ReturnsSystemRouteWithNullName_useSelectedRouteName() {

        // When the routing session does not have a name, and is a system session

        whenever(routingSession.name).thenReturn(null)

        whenever(mr2.getSelectedRoutes(any())).thenReturn(listOf(selectedRoute))

        whenever(selectedRoute.name).thenReturn(REMOTE_DEVICE_NAME)

        whenever(routingSession.isSystemSession).thenReturn(true)



        // Then the device name is the selected route name

        val data = loadMediaAndCaptureDeviceData()

        assertThat(data.name).isEqualTo(REMOTE_DEVICE_NAME)

    }



    @Test

    fun mr2ReturnsNonSystemRouteWithNullName_useLocalDeviceName() {

        // GIVEN that MR2Manager returns a routing session that does not have a name