diff options
| author | 2022-06-23 15:34:33 -0700 | |
|---|---|---|
| committer | 2022-08-12 20:45:59 +0000 | |
| commit | 004f092edaf2bc3bdbe0a517608af8a5b787435a (patch) | |
| tree | b25ac4ccc6afede6078e70ab825166b09bb3e2ab | |
| parent | 0699d0238b8b6d96fbd9979793f4d02b19247970 (diff) | |
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
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/media/MediaDataManager.kt | 2 |
1 files changed, 1 insertions, 1 deletions
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!!) |