Commit 7477f38e authored Jul 27, 2023 by Colin Cross

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
Change-Id: I73573f097832f6f4d5983f364b0dca3a59ad88a8

parent 36cb67fb

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -60,7 +60,7 @@ private val KNOWN_PLUGINS =
		"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