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

Commit 3ee9982d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix SystemUI build for kotlin 1.7.0" into tm-dev-plus-aosp am:... 

Merge "Fix SystemUI build for kotlin 1.7.0" into tm-dev-plus-aosp am: b0e1f57e am: 2190cca6 am: 3bc597a2

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



Change-Id: I055ca3eefdfde598e47bac068398ffb14226b403
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2350c354 3bc597a2

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

+1 −1
Original line number Diff line number Diff line
@@ -1096,7 +1096,7 @@ class MediaDataManager( 
    fun onNotificationRemoved(key: String) {

        Assert.isMainThread()

        val removed = mediaEntries.remove(key)

        if (useMediaResumption && removed?.resumeAction != null && removed?.isLocalSession()) {

        if (useMediaResumption && removed?.resumeAction != null && removed.isLocalSession()) {

            Log.d(TAG, "Not removing $key because resumable")

            // Move to resume key (aka package name) if that key doesn't already exist.

            val resumeAction = getResumeMediaAction(removed.resumeAction!!)