From d2b636679ca02010ff2aad73a07b403ab4feb89d Mon Sep 17 00:00:00 2001 From: Chaohui Wang Date: Thu, 15 Dec 2022 16:13:04 +0800 Subject: [PATCH] Annotate SafeVarargs to formatString So no warnings when using in Java. Bug: 199230342 Test: Robo test Change-Id: Icf43f5aa6c9415d0d2ef713f9b1e08a72acd4f45 --- .../android/settingslib/spa/framework/util/MessageFormats.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/util/MessageFormats.kt b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/util/MessageFormats.kt index 2adfcca0bf70e..edd30dd348609 100644 --- a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/util/MessageFormats.kt +++ b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/util/MessageFormats.kt @@ -25,10 +25,12 @@ import androidx.annotation.StringRes import java.util.Locale @RequiresApi(Build.VERSION_CODES.N) +@SafeVarargs fun Context.formatString(@StringRes resId: Int, vararg arguments: Pair): String = resources.formatString(resId, *arguments) @RequiresApi(Build.VERSION_CODES.N) +@SafeVarargs fun Resources.formatString(@StringRes resId: Int, vararg arguments: Pair): String = MessageFormat(getString(resId), Locale.getDefault(Locale.Category.FORMAT)) .format(mapOf(*arguments))