From 7477f38ebd9bcab21b487a22b306c89641558d78 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Thu, 27 Jul 2023 09:54:06 -0700
Subject: [PATCH] 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
---
 .../src/com/android/systemui/shared/clocks/ClockRegistry.kt     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 702cc05f7f5f3..f66dbfa233bd9 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 @@ 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