commit 33e518094d947ad50dd31c545f3362eb9576a027
author Colin Cross <ccross@android.com> Thu Jul 27 09:54:06 2023 -0700
committer Cherrypicker Worker <android-build-cherrypicker-worker@google.com> Fri Feb 02 08:59:16 2024 +0000
tree a506831044c3d22b7f36cb4a154cb30944337cc7
parent c368aff2be2f0b8797ca1edf75605ce259bfa881

Fix type inference errors with kotlinc 1.9.0

Fixes:
frameworks/base/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/ClockRegistry.kt:68:35: error: type mismatch: inferred type is TKey but TKey & Any was expected
val result = this.putIfAbsent(key, value)
^
frameworks/base/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/ClockRegistry.kt:68:40: error: type mismatch: inferred type is TVal but TVal & Any was expected
val result = this.putIfAbsent(key, value)
^

Bug: 291335478
Test: builds
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:7477f38ebd9bcab21b487a22b306c89641558d78)
Merged-In: I73573f097832f6f4d5983f364b0dca3a59ad88a8
Change-Id: I73573f097832f6f4d5983f364b0dca3a59ad88a8

packages/SystemUI/customization/src/com/android/systemui/shared/clocks/ClockRegistry.kt

diff --git a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/ClockRegistry.kt b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/ClockRegistry.kt
index 43290a3..a05773d 100644
--- a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/ClockRegistry.kt
+++ b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/ClockRegistry.kt
@@ -60,7 +60,7 @@
         "com.android.systemui.falcon.nine" to listOf(ClockMetadata("DIGITAL_CLOCK_WEATHER")),
     )
 
-private fun <TKey, TVal> ConcurrentHashMap<TKey, TVal>.concurrentGetOrPut(
+private fun <TKey : Any, TVal : Any> ConcurrentHashMap<TKey, TVal>.concurrentGetOrPut(
     key: TKey,
     value: TVal,
     onNew: () -> Unit