diff options
6 files changed, 5 insertions, 31 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/dagger/SysUIComponent.java b/packages/SystemUI/src/com/android/systemui/dagger/SysUIComponent.java index f1a58e6e8e51..6fdb4ca7238f 100644 --- a/packages/SystemUI/src/com/android/systemui/dagger/SysUIComponent.java +++ b/packages/SystemUI/src/com/android/systemui/dagger/SysUIComponent.java @@ -223,7 +223,7 @@ public interface SysUIComponent { Optional<NaturalRotationUnfoldProgressProvider> getNaturalRotationUnfoldProgressProvider(); /** */ - Optional<MediaMuteAwaitConnectionCli> getMediaMuteAwaitConnectionCli(); + MediaMuteAwaitConnectionCli getMediaMuteAwaitConnectionCli(); /** */ NearbyMediaDevicesManager getNearbyMediaDevicesManager(); diff --git a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt index a05dd1321de6..289ad129edf8 100644 --- a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt +++ b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt @@ -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") diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/pipeline/MediaDeviceManager.kt b/packages/SystemUI/src/com/android/systemui/media/controls/pipeline/MediaDeviceManager.kt index 3fc3ad682bc7..0a5f857af4ad 100644 --- a/packages/SystemUI/src/com/android/systemui/media/controls/pipeline/MediaDeviceManager.kt +++ b/packages/SystemUI/src/com/android/systemui/media/controls/pipeline/MediaDeviceManager.kt @@ -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) } } diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/util/MediaFlags.kt b/packages/SystemUI/src/com/android/systemui/media/controls/util/MediaFlags.kt index 07577023d3d6..42a6b7cf4b0d 100644 --- a/packages/SystemUI/src/com/android/systemui/media/controls/util/MediaFlags.kt +++ b/packages/SystemUI/src/com/android/systemui/media/controls/util/MediaFlags.kt @@ -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 diff --git a/packages/SystemUI/src/com/android/systemui/media/dagger/MediaModule.java b/packages/SystemUI/src/com/android/systemui/media/dagger/MediaModule.java index bc61ec12da85..888cd0bf8b9a 100644 --- a/packages/SystemUI/src/com/android/systemui/media/dagger/MediaModule.java +++ b/packages/SystemUI/src/com/android/systemui/media/dagger/MediaModule.java @@ -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()); - } } diff --git a/packages/SystemUI/src/com/android/systemui/media/muteawait/MediaMuteAwaitConnectionManagerFactory.kt b/packages/SystemUI/src/com/android/systemui/media/muteawait/MediaMuteAwaitConnectionManagerFactory.kt index e26089450c21..97ec654a627b 100644 --- a/packages/SystemUI/src/com/android/systemui/media/muteawait/MediaMuteAwaitConnectionManagerFactory.kt +++ b/packages/SystemUI/src/com/android/systemui/media/muteawait/MediaMuteAwaitConnectionManagerFactory.kt @@ -21,14 +21,12 @@ import com.android.settingslib.media.DeviceIconUtil import com.android.settingslib.media.LocalMediaManager import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Main -import com.android.systemui.media.controls.util.MediaFlags import java.util.concurrent.Executor import javax.inject.Inject /** Factory class to create [MediaMuteAwaitConnectionManager] instances. */ @SysUISingleton class MediaMuteAwaitConnectionManagerFactory @Inject constructor( - private val mediaFlags: MediaFlags, private val context: Context, private val logger: MediaMuteAwaitLogger, @Main private val mainExecutor: Executor @@ -36,10 +34,7 @@ class MediaMuteAwaitConnectionManagerFactory @Inject constructor( private val deviceIconUtil = DeviceIconUtil() /** Creates a [MediaMuteAwaitConnectionManager]. */ - fun create(localMediaManager: LocalMediaManager): MediaMuteAwaitConnectionManager? { - if (!mediaFlags.areMuteAwaitConnectionsEnabled()) { - return null - } + fun create(localMediaManager: LocalMediaManager): MediaMuteAwaitConnectionManager { return MediaMuteAwaitConnectionManager( mainExecutor, localMediaManager, context, deviceIconUtil, logger ) |