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

Commit 7a2bbdbb authored by Caitlin Shkuratov's avatar Caitlin Shkuratov
Browse files

[Media] Remove MEDIA_NEARBY_DEVICES flag. 

Fixes: 254512726
Test: compiles
Test: atest MediaOutputBaseDialogTest MediaOutputBroadcastDialogTest
MediaOutputControllerTest MediaOutputDialogTest
Change-Id: I80bc26bf798f6ac99ed6aee564f4808c5c95d51c

Change-Id: Idde72a4fd2e21ecd20981283f03102baa4ccbed5
parent 4894e35f

packages/SystemUI/src/com/android/systemui/dagger/SysUIComponent.java

+1 −1
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ public interface SysUIComponent { 
    Optional<MediaMuteAwaitConnectionCli> getMediaMuteAwaitConnectionCli();



    /** */

    Optional<NearbyMediaDevicesManager> getNearbyMediaDevicesManager();

    NearbyMediaDevicesManager getNearbyMediaDevicesManager();



    /**

     * Returns {@link CoreStartable}s that should be started with the application.

packages/SystemUI/src/com/android/systemui/flags/Flags.kt

+0 −3
Original line number Diff line number Diff line
@@ -411,9 +411,6 @@ object Flags { 
    // TODO(b/254512502): Tracking Bug

    val MEDIA_SESSION_ACTIONS = unreleasedFlag(901, "media_session_actions")



    // TODO(b/254512726): Tracking Bug

    val MEDIA_NEARBY_DEVICES = releasedFlag(903, "media_nearby_devices")



    // TODO(b/254512695): Tracking Bug

    val MEDIA_MUTE_AWAIT = releasedFlag(904, "media_mute_await")

packages/SystemUI/src/com/android/systemui/media/controls/util/MediaFlags.kt

+0 −6
Original line number Diff line number Diff line
@@ -37,12 +37,6 @@ class MediaFlags @Inject constructor(private val featureFlags: FeatureFlags) { 
    /** Check whether we support displaying information about mute await connections. */

    fun areMuteAwaitConnectionsEnabled() = featureFlags.isEnabled(Flags.MEDIA_MUTE_AWAIT)



    /**

     * Check whether we enable support for nearby media devices. See

     * [android.app.StatusBarManager.registerNearbyMediaDevicesProvider] for more information.

     */

    fun areNearbyMediaDevicesEnabled() = featureFlags.isEnabled(Flags.MEDIA_NEARBY_DEVICES)



    /**

     * If true, keep active media controls for the lifetime of the MediaSession, regardless of

     * whether the underlying notification was dismissed

packages/SystemUI/src/com/android/systemui/media/dagger/MediaModule.java

+0 −13
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ import com.android.systemui.media.controls.ui.MediaHostStatesManager; 
import com.android.systemui.media.controls.util.MediaFlags;

import com.android.systemui.media.dream.dagger.MediaComplicationComponent;

import com.android.systemui.media.muteawait.MediaMuteAwaitConnectionCli;

import com.android.systemui.media.nearby.NearbyMediaDevicesManager;

import com.android.systemui.media.taptotransfer.MediaTttCommandLineHelper;

import com.android.systemui.media.taptotransfer.MediaTttFlags;

import com.android.systemui.media.taptotransfer.receiver.MediaTttReceiverLogBuffer;
@@ -132,16 +131,4 @@ public interface MediaModule { 
        }

        return Optional.of(muteAwaitConnectionCliLazy.get());

    }



    /** */

    @Provides

    @SysUISingleton

    static Optional<NearbyMediaDevicesManager> providesNearbyMediaDevicesManager(

            MediaFlags mediaFlags,

            Lazy<NearbyMediaDevicesManager> nearbyMediaDevicesManagerLazy) {

        if (!mediaFlags.areNearbyMediaDevicesEnabled()) {

            return Optional.empty();

        }

        return Optional.of(nearbyMediaDevicesManagerLazy.get());

    }

}

packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBroadcastDialogFactory.kt

+2 −3
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ import com.android.systemui.media.nearby.NearbyMediaDevicesManager 
import com.android.systemui.plugins.ActivityStarter

import com.android.systemui.settings.UserTracker

import com.android.systemui.statusbar.notification.collection.notifcollection.CommonNotifCollection

import java.util.Optional

import javax.inject.Inject



/**
@@ -46,7 +45,7 @@ class MediaOutputBroadcastDialogFactory @Inject constructor( 
    private val notifCollection: CommonNotifCollection,

    private val uiEventLogger: UiEventLogger,

    private val dialogLaunchAnimator: DialogLaunchAnimator,

    private val nearbyMediaDevicesManagerOptional: Optional<NearbyMediaDevicesManager>,

    private val nearbyMediaDevicesManager: NearbyMediaDevicesManager,

    private val audioManager: AudioManager,

    private val powerExemptionManager: PowerExemptionManager,

    private val keyGuardManager: KeyguardManager,
@@ -62,7 +61,7 @@ class MediaOutputBroadcastDialogFactory @Inject constructor( 


        val controller = MediaOutputController(context, packageName,

                mediaSessionManager, lbm, starter, notifCollection,

                dialogLaunchAnimator, nearbyMediaDevicesManagerOptional, audioManager,

                dialogLaunchAnimator, nearbyMediaDevicesManager, audioManager,

                powerExemptionManager, keyGuardManager, featureFlags, userTracker)

        val dialog =

                MediaOutputBroadcastDialog(context, aboveStatusBar, broadcastSender, controller)