Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I3e35e422307c91540ee0ae82a84d31890eff49cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-06-24 03:08:49 +00:00
committed by Automerger Merge Worker
parent 07eecf49ae b0e1f57eac
commit 2190cca63a
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/media/MediaDataManager.kt
View File

@@ -1095,7 +1095,7 @@ class MediaDataManager(
fun onNotificationRemoved(key: String) { fun onNotificationRemoved(key: String) {
Assert.isMainThread() Assert.isMainThread()
val removed = mediaEntries.remove(key) 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") Log.d(TAG, "Not removing $key because resumable")
// Move to resume key (aka package name) if that key doesn't already exist. // Move to resume key (aka package name) if that key doesn't already exist.
val resumeAction = getResumeMediaAction(removed.resumeAction!!) val resumeAction = getResumeMediaAction(removed.resumeAction!!)