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

Commit 193abff1 authored by Beth Thibodeau's avatar Beth Thibodeau Committed by Automerger Merge Worker
Browse files

Merge "Check ongoing flag for media control dismissal" into tm-qpr-dev am: f5fb9c63 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20965591



Change-Id: I5f771d28243151a9723c1fef36e30f6e3bb5c952
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f6a293ad f5fb9c63

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

+1 −1
Original line number Diff line number Diff line
@@ -863,7 +863,7 @@ class MediaDataManager( 
                    notificationKey = key,

                    hasCheckedForResume = hasCheckedForResume,

                    isPlaying = isPlaying,

                    isClearable = sbn.isClearable(),

                    isClearable = !sbn.isOngoing,

                    lastActive = lastActive,

                    instanceId = instanceId,

                    appUid = appUid,

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

+34 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.systemui.media.controls.pipeline



import android.app.Notification

import android.app.Notification.FLAG_NO_CLEAR

import android.app.Notification.MediaStyle

import android.app.PendingIntent

import android.app.smartspace.SmartspaceAction
@@ -1451,6 +1452,39 @@ class MediaDataManagerTest : SysuiTestCase() { 
        assertThat(mediaDataCaptor.value.semanticActions).isNull()

    }



    @Test

    fun testNoClearNotOngoing_canDismiss() {

        mediaNotification =

            SbnBuilder().run {

                setPkg(PACKAGE_NAME)

                modifyNotification(context).also {

                    it.setSmallIcon(android.R.drawable.ic_media_pause)

                    it.setStyle(MediaStyle().apply { setMediaSession(session.sessionToken) })

                    it.setOngoing(false)

                    it.setFlag(FLAG_NO_CLEAR, true)

                }

                build()

            }

        addNotificationAndLoad()

        assertThat(mediaDataCaptor.value.isClearable).isTrue()

    }



    @Test

    fun testOngoing_cannotDismiss() {

        mediaNotification =

            SbnBuilder().run {

                setPkg(PACKAGE_NAME)

                modifyNotification(context).also {

                    it.setSmallIcon(android.R.drawable.ic_media_pause)

                    it.setStyle(MediaStyle().apply { setMediaSession(session.sessionToken) })

                    it.setOngoing(true)

                }

                build()

            }

        addNotificationAndLoad()

        assertThat(mediaDataCaptor.value.isClearable).isFalse()

    }



    /** Helper function to add a media notification and capture the resulting MediaData */

    private fun addNotificationAndLoad() {

        mediaDataManager.onNotificationAdded(KEY, mediaNotification)