Merge "Suppress warnings for settingslib" into main (e39969fe) · Commits · e / os / android_frameworks_base

packages/SettingsLib/DataStore/src/com/android/settingslib/datastore/KeyValueStore.kt

+3 −0

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@ interface KeyValueStore : KeyedObservable<String> {
		fun contains(key: String): Boolean

		/** Gets default value of given key. */
		@Suppress("UNCHECKED_CAST")
		fun <T : Any> getDefaultValue(key: String, valueType: Class<T>): T? =
		when (valueType) {
		Boolean::class.javaObjectType -> false
		@@ -56,6 +57,7 @@ interface SharedPreferencesKeyValueStore : KeyValueStore {

		override fun contains(key: String): Boolean = sharedPreferences.contains(key)

		@Suppress("IMPLICIT_CAST_TO_ANY", "UNCHECKED_CAST")
		override fun <T : Any> getValue(key: String, valueType: Class<T>): T? =
		when (valueType) {
		Boolean::class.javaObjectType -> sharedPreferences.getBoolean(key, false)
		@@ -68,6 +70,7 @@ interface SharedPreferencesKeyValueStore : KeyValueStore {
		}
		as T?

		@Suppress("UNCHECKED_CAST")
		override fun <T : Any> setValue(key: String, valueType: Class<T>, value: T?) {
		if (value == null) {
		sharedPreferences.edit().remove(key).apply()

+1 −0

Original line number	Diff line number	Diff line
		@@ -34,6 +34,7 @@ class SettingsGlobalStore private constructor(contentResolver: ContentResolver)

		override fun contains(key: String): Boolean = Global.getString(contentResolver, key) != null

		@Suppress("UNCHECKED_CAST")
		override fun <T : Any> getValue(key: String, valueType: Class<T>): T? =
		try {
		when (valueType) {

+1 −0

Original line number	Diff line number	Diff line
		@@ -34,6 +34,7 @@ class SettingsSecureStore private constructor(contentResolver: ContentResolver)

		override fun contains(key: String): Boolean = Secure.getString(contentResolver, key) != null

		@Suppress("UNCHECKED_CAST")
		override fun <T : Any> getValue(key: String, valueType: Class<T>): T? =
		try {
		when (valueType) {

+1 −1

Original line number	Diff line number	Diff line
		@@ -27,7 +27,7 @@ import java.util.concurrent.Executor
		import java.util.concurrent.atomic.AtomicInteger

		/** Base class of the Settings provider data stores. */
		open abstract class SettingsStore(protected val contentResolver: ContentResolver) :
		abstract class SettingsStore(protected val contentResolver: ContentResolver) :
		KeyedDataObservable<String>(), KeyValueStore {

		/**

+1 −0

Original line number	Diff line number	Diff line
		@@ -34,6 +34,7 @@ class SettingsSystemStore private constructor(contentResolver: ContentResolver)

		override fun contains(key: String): Boolean = System.getString(contentResolver, key) != null

		@Suppress("UNCHECKED_CAST")
		override fun <T : Any> getValue(key: String, valueType: Class<T>): T? =
		try {
		when (valueType) {