From 004f092edaf2bc3bdbe0a517608af8a5b787435a Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Thu, 23 Jun 2022 15:34:33 -0700 Subject: Fix SystemUI build for kotlin 1.7.0 Kotlin 1.7.0 converts the UNEXPECTED_SAFE_CALL warning into an error: frameworks/base/packages/SystemUI/src/com/android/systemui/media/MediaDataManager.kt:780:68: error: type mismatch: inferred type is Boolean? but Boolean was expected if (useMediaResumption && removed?.resumeAction != null && removed?.isLocalSession()) { ^ Replace the unnecessary ?. operator. Bug: 216136346 Test: builds Change-Id: Ib1605aaff28492b557deac4156f3cc2f4cf8b329 (cherry picked from commit 6e3d0a66d237b143047765ea6041422a567c5c8d) Merged-In: Ib1605aaff28492b557deac4156f3cc2f4cf8b329 --- packages/SystemUI/src/com/android/systemui/media/MediaDataManager.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/media/MediaDataManager.kt b/packages/SystemUI/src/com/android/systemui/media/MediaDataManager.kt index 6a69d427929e..3cfd95bc3e10 100644 --- a/packages/SystemUI/src/com/android/systemui/media/MediaDataManager.kt +++ b/packages/SystemUI/src/com/android/systemui/media/MediaDataManager.kt @@ -1095,7 +1095,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!!) -- cgit v1.2.3-59-g8ed1b