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

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

Change-Id: Ia0a2381ca384199dc75c7be35b70af5723192ffe
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:24:56 +00:00
committed by Automerger Merge Worker

View File

@@ -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!!)