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

Commit b2a8c5bf authored by Caitlin Shkuratov's avatar Caitlin Shkuratov
Browse files

[Media] Remove MEDIA_MUTE_AWAIT flag. 

Fixes: 254512695
Test: compiles
Test: atest MediaDeviceManagerTest
Change-Id: I7dc249dfea01559d3212d659b655b232aa3a1119
parent 7a2bbdbb

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

+1 −1
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ public interface SysUIComponent { 
    Optional<NaturalRotationUnfoldProgressProvider> getNaturalRotationUnfoldProgressProvider();



    /** */

    Optional<MediaMuteAwaitConnectionCli> getMediaMuteAwaitConnectionCli();

    MediaMuteAwaitConnectionCli getMediaMuteAwaitConnectionCli();



    /** */

    NearbyMediaDevicesManager getNearbyMediaDevicesManager();

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/254512695): Tracking Bug

    val MEDIA_MUTE_AWAIT = releasedFlag(904, "media_mute_await")



    // TODO(b/254512654): Tracking Bug

    @JvmField val DREAM_MEDIA_COMPLICATION = unreleasedFlag(905, "dream_media_complication")

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

+3 −3
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ constructor( 
        val oldKey: String?,

        val controller: MediaController?,

        val localMediaManager: LocalMediaManager,

        val muteAwaitConnectionManager: MediaMuteAwaitConnectionManager?

        val muteAwaitConnectionManager: MediaMuteAwaitConnectionManager,

    ) :

        LocalMediaManager.DeviceCallback,

        MediaController.Callback(),
@@ -180,7 +180,7 @@ constructor( 
                if (!started) {

                    localMediaManager.registerCallback(this)

                    localMediaManager.startScan()

                    muteAwaitConnectionManager?.startListening()

                    muteAwaitConnectionManager.startListening()

                    playbackType = controller?.playbackInfo?.playbackType ?: PLAYBACK_TYPE_UNKNOWN

                    playbackVolumeControlId = controller?.playbackInfo?.volumeControlId

                    controller?.registerCallback(this)
@@ -198,7 +198,7 @@ constructor( 
                    controller?.unregisterCallback(this)

                    localMediaManager.stopScan()

                    localMediaManager.unregisterCallback(this)

                    muteAwaitConnectionManager?.stopListening()

                    muteAwaitConnectionManager.stopListening()

                    configurationController.removeCallback(configListener)

                }

            }

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

+0 −3
Original line number Diff line number Diff line
@@ -34,9 +34,6 @@ class MediaFlags @Inject constructor(private val featureFlags: FeatureFlags) { 
        return enabled || featureFlags.isEnabled(Flags.MEDIA_SESSION_ACTIONS)

    }



    /** Check whether we support displaying information about mute await connections. */

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



    /**

     * 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 −15
Original line number Diff line number Diff line
@@ -23,9 +23,7 @@ import com.android.systemui.media.controls.pipeline.MediaDataManager; 
import com.android.systemui.media.controls.ui.MediaHierarchyManager;

import com.android.systemui.media.controls.ui.MediaHost;

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.taptotransfer.MediaTttCommandLineHelper;

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

import com.android.systemui.media.taptotransfer.receiver.MediaTttReceiverLogBuffer;
@@ -118,17 +116,4 @@ public interface MediaModule { 
        }

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

    }



    /** */

    @Provides

    @SysUISingleton

    static Optional<MediaMuteAwaitConnectionCli> providesMediaMuteAwaitConnectionCli(

            MediaFlags mediaFlags,

            Lazy<MediaMuteAwaitConnectionCli> muteAwaitConnectionCliLazy

    ) {

        if (!mediaFlags.areMuteAwaitConnectionsEnabled()) {

            return Optional.empty();

        }

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

    }

}