Merge "Fix SystemUI build for kotlin 1.7.0" into stage-aosp-master
This commit is contained in:
committed by
Android (Google) Code Review
commit
c735b93e37
@@ -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!!)
|
||||||
|
|||||||
Reference in New Issue
Block a user