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

Commit afc63afd authored by Beth Thibodeau's avatar Beth Thibodeau Committed by Android (Google) Code Review
Browse files

Merge "Clean up MEDIA_RESUME_PROGRESS flag" into main

parents 546dbf91 7a001cfe

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

+0 −3
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ import androidx.media.utils.MediaConstants 
import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.filters.SmallTest

import com.android.systemui.SysuiTestCase

import com.android.systemui.flags.Flags.MEDIA_RESUME_PROGRESS

import com.android.systemui.flags.fakeFeatureFlagsClassic

import com.android.systemui.graphics.ImageLoader

import com.android.systemui.graphics.imageLoader
@@ -167,8 +166,6 @@ class MediaDataLoaderTest : SysuiTestCase() { 
    @Test

    fun loadMediaDataForResumption_returnsMediaData() =

        testScope.runTest {

            fakeFeatureFlags.set(MEDIA_RESUME_PROGRESS, true)



            val song = "THIS_IS_A_SONG"

            val artist = "THIS_IS_AN_ARTIST"

            val albumArt = Bitmap.createBitmap(100, 100, Bitmap.Config.ARGB_8888)

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

    val MEDIA_RESUME_PROGRESS = releasedFlag("media_resume_progress")



    // TODO(b/270437894): Tracking Bug

    val MEDIA_REMOTE_RESUME = unreleasedFlag("media_remote_resume")

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

+1 −5
Original line number Diff line number Diff line
@@ -875,11 +875,7 @@ class LegacyMediaDataManagerImpl( 
            desc.extras?.getLong(MediaConstants.METADATA_KEY_IS_EXPLICIT) ==

                MediaConstants.METADATA_VALUE_ATTRIBUTE_PRESENT



        val progress =

            if (mediaFlags.isResumeProgressEnabled()) {

                MediaDataUtils.getDescriptionProgress(desc.extras)

            } else null



        val progress = MediaDataUtils.getDescriptionProgress(desc.extras)

        val mediaAction = getResumeMediaAction(resumeAction)

        val lastActive = systemClock.elapsedRealtime()

        val createdTimestampMillis = currentEntry?.createdTimestampMillis ?: 0L

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

+1 −5
Original line number Diff line number Diff line
@@ -339,11 +339,7 @@ constructor( 
                desc.extras?.getLong(MediaConstants.METADATA_KEY_IS_EXPLICIT) ==

                    MediaConstants.METADATA_VALUE_ATTRIBUTE_PRESENT



            val progress =

                if (mediaFlags.isResumeProgressEnabled()) {

                    MediaDataUtils.getDescriptionProgress(desc.extras)

                } else null



            val progress = MediaDataUtils.getDescriptionProgress(desc.extras)

            val mediaAction = getResumeMediaAction(resumeAction)

            return MediaDataLoaderResult(

                appName = appName,

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

+1 −5
Original line number Diff line number Diff line
@@ -719,11 +719,7 @@ class MediaDataProcessor( 
            desc.extras?.getLong(MediaConstants.METADATA_KEY_IS_EXPLICIT) ==

                MediaConstants.METADATA_VALUE_ATTRIBUTE_PRESENT



        val progress =

            if (mediaFlags.isResumeProgressEnabled()) {

                MediaDataUtils.getDescriptionProgress(desc.extras)

            } else null



        val progress = MediaDataUtils.getDescriptionProgress(desc.extras)

        val mediaAction = getResumeMediaAction(resumeAction)

        val lastActive = systemClock.elapsedRealtime()

        val createdTimestampMillis = currentEntry?.createdTimestampMillis ?: 0L