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

Commit 0e3d8827 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Clean up MEDIA_REMOTE_RESUME flag" into main

parents 5ba7eda2 fc57496f

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

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

    val MEDIA_RETAIN_SESSIONS = unreleasedFlag("media_retain_sessions")



    // TODO(b/270437894): Tracking Bug

    val MEDIA_REMOTE_RESUME = unreleasedFlag("media_remote_resume")



    // 1000 - dock

    val SIMULATE_DOCK_THROUGH_CHARGING = releasedFlag("simulate_dock_through_charging")

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

+1 −4
Original line number Diff line number Diff line
@@ -1188,10 +1188,7 @@ class LegacyMediaDataManagerImpl( 
    }



    private fun isAbleToResume(data: MediaData): Boolean {

        val isEligibleForResume =

            data.isLocalSession() ||

                (mediaFlags.isRemoteResumeAllowed() &&

                    data.playbackLocation != MediaData.PLAYBACK_CAST_REMOTE)

        val isEligibleForResume = data.isLocalSession()

        return useMediaResumption && data.resumeAction != null && isEligibleForResume

    }

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

+1 −4
Original line number Diff line number Diff line
@@ -1143,10 +1143,7 @@ class MediaDataProcessor( 
    }



    private fun isAbleToResume(data: MediaData): Boolean {

        val isEligibleForResume =

            data.isLocalSession() ||

                (mediaFlags.isRemoteResumeAllowed() &&

                    data.playbackLocation != MediaData.PLAYBACK_CAST_REMOTE)

        val isEligibleForResume = data.isLocalSession()

        return useMediaResumption && data.resumeAction != null && isEligibleForResume

    }

packages/SystemUI/src/com/android/systemui/media/controls/domain/resume/MediaResumeListener.kt

+1 −6
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ import com.android.systemui.dump.DumpManager 
import com.android.systemui.media.controls.domain.pipeline.MediaDataManager

import com.android.systemui.media.controls.domain.pipeline.RESUME_MEDIA_TIMEOUT

import com.android.systemui.media.controls.shared.model.MediaData

import com.android.systemui.media.controls.util.MediaFlags

import com.android.systemui.settings.UserTracker

import com.android.systemui.tuner.TunerService

import com.android.systemui.util.Utils
@@ -67,7 +66,6 @@ constructor( 
    private val mediaBrowserFactory: ResumeMediaBrowserFactory,

    dumpManager: DumpManager,

    private val systemClock: SystemClock,

    private val mediaFlags: MediaFlags,

) : MediaDataManager.Listener, Dumpable {



    private var useMediaResumption: Boolean = Utils.useMediaResumption(context)
@@ -251,10 +249,7 @@ constructor( 
                mediaBrowser = null

            }

            // If we don't have a resume action, check if we haven't already

            val isEligibleForResume =

                data.isLocalSession() ||

                    (mediaFlags.isRemoteResumeAllowed() &&

                        data.playbackLocation != MediaData.PLAYBACK_CAST_REMOTE)

            val isEligibleForResume = data.isLocalSession()

            if (data.resumeAction == null && !data.hasCheckedForResume && isEligibleForResume) {

                // TODO also check for a media button receiver intended for restarting (b/154127084)

                // Set null action to prevent additional attempts to connect

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

+0 −3
Original line number Diff line number Diff line
@@ -45,7 +45,4 @@ class MediaFlags @Inject constructor(private val featureFlags: FeatureFlagsClass 
     * whether the underlying notification was dismissed

     */

    fun isRetainingPlayersEnabled() = featureFlags.isEnabled(FlagsClassic.MEDIA_RETAIN_SESSIONS)



    /** Check whether we allow remote media to generate resume controls */

    fun isRemoteResumeAllowed() = featureFlags.isEnabled(FlagsClassic.MEDIA_REMOTE_RESUME)

}