Merge "[Catalyst] Eliminate unnecessary singletons" into main (0ae551b0) · Commits · e / os / android_frameworks_base

packages/SettingsLib/Graph/src/com/android/settingslib/graph/GetPreferenceGraphApiHandler.kt

+13 −11

Original line number	Diff line number	Diff line
		@@ -38,11 +38,9 @@ class GetPreferenceGraphApiHandler(
		private val preferenceScreenProviders: Set<Class<out PreferenceScreenProvider>> = emptySet(),
		) : ApiHandler<GetPreferenceGraphRequest, PreferenceGraphProto> {

		override val requestCodec: MessageCodec<GetPreferenceGraphRequest>
		get() = GetPreferenceGraphRequestCodec
		override val requestCodec = GetPreferenceGraphRequestCodec()

		override val responseCodec: MessageCodec<PreferenceGraphProto>
		get() = PreferenceGraphProtoCodec
		override val responseCodec = PreferenceGraphProtoCodec()

		override fun hasPermission(
		application: Application,
		@@ -99,7 +97,7 @@ constructor(
		val flags: Int = PreferenceGetterFlags.ALL,
		)

		object GetPreferenceGraphRequestCodec : MessageCodec<GetPreferenceGraphRequest> {
		class GetPreferenceGraphRequestCodec : MessageCodec<GetPreferenceGraphRequest> {
		override fun encode(data: GetPreferenceGraphRequest): Bundle =
		Bundle(4).apply {
		putParcelableArray(KEY_SCREENS, data.screens.toTypedArray())
		@@ -126,18 +124,22 @@ object GetPreferenceGraphRequestCodec : MessageCodec<GetPreferenceGraphRequest>
		)
		}

		companion object {
		private const val KEY_SCREENS = "s"
		private const val KEY_VISITED_SCREENS = "v"
		private const val KEY_LOCALE = "l"
		private const val KEY_FLAGS = "f"
		}
		}

		object PreferenceGraphProtoCodec : MessageCodec<PreferenceGraphProto> {
		class PreferenceGraphProtoCodec : MessageCodec<PreferenceGraphProto> {
		override fun encode(data: PreferenceGraphProto): Bundle =
		Bundle(1).apply { putByteArray(KEY_GRAPH, data.toByteArray()) }

		override fun decode(data: Bundle): PreferenceGraphProto =
		PreferenceGraphProto.parseFrom(data.getByteArray(KEY_GRAPH)!!)

		companion object {
		private const val KEY_GRAPH = "g"
		}
		}

packages/SettingsLib/Graph/src/com/android/settingslib/graph/PreferenceSetterApi.kt

+10 −12

Original line number	Diff line number	Diff line
		@@ -88,11 +88,9 @@ annotation class PreferenceSetterResult {
		class PreferenceSetterApiDescriptor(override val id: Int) :
		ApiDescriptor<PreferenceSetterRequest, Int> {

		override val requestCodec: MessageCodec<PreferenceSetterRequest>
		get() = PreferenceSetterRequestCodec
		override val requestCodec = PreferenceSetterRequestCodec()

		override val responseCodec: MessageCodec<Int>
		get() = IntMessageCodec
		override val responseCodec = IntMessageCodec()
		}

		/** Preference setter API implementation. */
		@@ -207,11 +205,9 @@ class PreferenceSetterApiHandler(
		return result
		}

		override val requestCodec: MessageCodec<PreferenceSetterRequest>
		get() = PreferenceSetterRequestCodec
		override val requestCodec = PreferenceSetterRequestCodec()

		override val responseCodec: MessageCodec<Int>
		get() = IntMessageCodec
		override val responseCodec = IntMessageCodec()
		}

		/** Evaluates the write permit of a persistent preference. */
		@@ -225,7 +221,7 @@ fun <T> PersistentPreference<T>.evalWritePermit(
		?: getWritePermit(context, value, callingPid, callingUid)

		/** Message codec for [PreferenceSetterRequest]. */
		object PreferenceSetterRequestCodec : MessageCodec<PreferenceSetterRequest> {
		class PreferenceSetterRequestCodec : MessageCodec<PreferenceSetterRequest> {
		override fun encode(data: PreferenceSetterRequest) =
		Bundle(3).apply {
		putString(SCREEN_KEY, data.screenKey)
		@@ -242,7 +238,9 @@ object PreferenceSetterRequestCodec : MessageCodec<PreferenceSetterRequest> {
		PreferenceValueProto.parseFrom(data.getByteArray(null)!!),
		)

		companion object {
		private const val SCREEN_KEY = "s"
		private const val KEY = "k"
		private const val ARGS = "a"
		}
		}

packages/SettingsLib/Ipc/src/com/android/settingslib/ipc/MessageCodecs.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -19,7 +19,7 @@ package com.android.settingslib.ipc
		import android.os.Bundle

		/** [MessageCodec] for [Int]. */
		object IntMessageCodec : MessageCodec<Int> {
		class IntMessageCodec : MessageCodec<Int> {
		override fun encode(data: Int): Bundle = Bundle(1).apply { putInt(null, data) }

		override fun decode(data: Bundle): Int = data.getInt(null)

packages/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceBindingFactory.kt

+3 −1

Original line number	Diff line number	Diff line
		@@ -54,6 +54,8 @@ interface PreferenceBindingFactory {

		/** Default [PreferenceBindingFactory]. */
		open class DefaultPreferenceBindingFactory : PreferenceBindingFactory {
		/** Default [PreferenceBinding]. */
		private val defaultBinding: PreferenceBinding = object : PreferenceBinding {}

		override fun getPreferenceBinding(metadata: PreferenceMetadata) =
		metadata as? PreferenceBinding
		@@ -61,7 +63,7 @@ open class DefaultPreferenceBindingFactory : PreferenceBindingFactory {
		is SwitchPreference -> SwitchPreferenceBinding.INSTANCE
		is PreferenceCategory -> PreferenceCategoryBinding.INSTANCE
		is MainSwitchPreference -> MainSwitchPreferenceBinding.INSTANCE
		else -> DefaultPreferenceBinding
		else -> defaultBinding
		}
		}

packages/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceBindings.kt

+0 −3

Original line number	Diff line number	Diff line
		@@ -71,6 +71,3 @@ interface MainSwitchPreferenceBinding : BooleanValuePreferenceBinding {
		@JvmStatic val INSTANCE = object : MainSwitchPreferenceBinding {}
		}
		}

		/** Default [PreferenceBinding] for [Preference]. */
		object DefaultPreferenceBinding : PreferenceBinding