Replace @GlobalConfig with @Main (869a4eda) · Commits · e / os / android_frameworks_base

packages/SystemUI/lint-baseline.xml

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -33959,5 +33959,6 @@
	file="frameworks/base/packages/SystemUI/src/com/android/systemui/biometrics/domain/interactor/SideFpsSensorInteractor.kt"		file="frameworks/base/packages/SystemUI/src/com/android/systemui/biometrics/domain/interactor/SideFpsSensorInteractor.kt"
	line="53"		line="53"
	column="5"/>		column="5"/>
			</issue>

	</issues>		</issues>

packages/SystemUI/src/com/android/systemui/bouncer/data/repository/EmergencyServicesRepository.kt

+2 −3

Original line number	Original line	Diff line number	Diff line
	@@ -18,7 +18,6 @@ package com.android.systemui.bouncer.data.repository

	import android.content.res.Resources		import android.content.res.Resources
	import com.android.internal.R		import com.android.internal.R
	import com.android.systemui.common.ui.GlobalConfig
	import com.android.systemui.common.ui.data.repository.ConfigurationRepository		import com.android.systemui.common.ui.data.repository.ConfigurationRepository
	import com.android.systemui.dagger.SysUISingleton		import com.android.systemui.dagger.SysUISingleton
	import com.android.systemui.dagger.qualifiers.Application		import com.android.systemui.dagger.qualifiers.Application
	@@ -37,7 +36,7 @@ class EmergencyServicesRepository
	constructor(		constructor(
	@Application private val applicationScope: CoroutineScope,		@Application private val applicationScope: CoroutineScope,
	@Main private val resources: Resources,		@Main private val resources: Resources,
	@GlobalConfig configurationRepository: ConfigurationRepository,		@Main configurationRepository: ConfigurationRepository,
	) {		) {
	/**		/**
	* Whether to enable emergency services calls while the SIM card is locked. This is disabled in		* Whether to enable emergency services calls while the SIM card is locked. This is disabled in
	@@ -49,7 +48,7 @@ constructor(
	.stateIn(		.stateIn(
	scope = applicationScope,		scope = applicationScope,
	started = SharingStarted.Eagerly,		started = SharingStarted.Eagerly,
	initialValue = getEnableEmergencyCallWhileSimLocked()		initialValue = getEnableEmergencyCallWhileSimLocked(),
	)		)

	private fun getEnableEmergencyCallWhileSimLocked(): Boolean {		private fun getEnableEmergencyCallWhileSimLocked(): Boolean {

packages/SystemUI/src/com/android/systemui/common/ui/ConfigurationModule.kt

+7 −16

Original line number	Original line	Diff line number	Diff line
	@@ -22,20 +22,11 @@ import com.android.systemui.common.ui.domain.interactor.ConfigurationInteractor
	import com.android.systemui.common.ui.domain.interactor.ConfigurationInteractorImpl		import com.android.systemui.common.ui.domain.interactor.ConfigurationInteractorImpl
	import com.android.systemui.dagger.SysUISingleton		import com.android.systemui.dagger.SysUISingleton
	import com.android.systemui.dagger.qualifiers.Application		import com.android.systemui.dagger.qualifiers.Application
			import com.android.systemui.dagger.qualifiers.Main
	import com.android.systemui.statusbar.policy.ConfigurationController		import com.android.systemui.statusbar.policy.ConfigurationController
	import dagger.Binds		import dagger.Binds
	import dagger.Module		import dagger.Module
	import dagger.Provides		import dagger.Provides
	import javax.inject.Qualifier

	/**
	* Annotates elements that provide information from the global configuration.
	*
	* The global configuration is the one associated with the main display. Secondary displays will
	* apply override to the global configuration. Elements annotated with this shouldn't be used for
	* secondary displays.
	*/
	@Qualifier @Retention(AnnotationRetention.RUNTIME) annotation class GlobalConfig

	@Module		@Module
	interface ConfigurationModule {		interface ConfigurationModule {
	@@ -45,21 +36,21 @@ interface ConfigurationModule {
	* now, without annotation the global config associated state is provided.		* now, without annotation the global config associated state is provided.
	*/		*/
	@Binds		@Binds
	@Deprecated("Use the @GlobalConfig annotated one instead of this.")		@Deprecated("Use the @Main annotated one instead of this.")
	fun provideGlobalConfigurationState(		fun provideGlobalConfigurationState(
	@GlobalConfig configurationState: ConfigurationState		@Main configurationState: ConfigurationState
	): ConfigurationState		): ConfigurationState

	@Binds		@Binds
	@Deprecated("Use the @GlobalConfig annotated one instead of this.")		@Deprecated("Use the @Main annotated one instead of this.")
	fun provideDefaultConfigurationState(		fun provideDefaultConfigurationState(
	@GlobalConfig configurationState: ConfigurationInteractor		@Main configurationState: ConfigurationInteractor
	): ConfigurationInteractor		): ConfigurationInteractor

	companion object {		companion object {
	@SysUISingleton		@SysUISingleton
	@Provides		@Provides
	@GlobalConfig		@Main
	fun provideGlobalConfigurationState(		fun provideGlobalConfigurationState(
	configStateFactory: ConfigurationStateImpl.Factory,		configStateFactory: ConfigurationStateImpl.Factory,
	configurationController: ConfigurationController,		configurationController: ConfigurationController,
	@@ -70,7 +61,7 @@ interface ConfigurationModule {

	@SysUISingleton		@SysUISingleton
	@Provides		@Provides
	@GlobalConfig		@Main
	fun provideGlobalConfigurationInteractor(		fun provideGlobalConfigurationInteractor(
	configurationRepository: ConfigurationRepository		configurationRepository: ConfigurationRepository
	): ConfigurationInteractor {		): ConfigurationInteractor {

packages/SystemUI/src/com/android/systemui/common/ui/data/repository/ConfigurationRepository.kt

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -23,9 +23,9 @@ import android.view.DisplayInfo
	import androidx.annotation.DimenRes		import androidx.annotation.DimenRes
	import com.android.systemui.common.coroutine.ChannelExt.trySendWithFailureLogging		import com.android.systemui.common.coroutine.ChannelExt.trySendWithFailureLogging
	import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow		import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow
	import com.android.systemui.common.ui.GlobalConfig
	import com.android.systemui.dagger.SysUISingleton		import com.android.systemui.dagger.SysUISingleton
	import com.android.systemui.dagger.qualifiers.Application		import com.android.systemui.dagger.qualifiers.Application
			import com.android.systemui.dagger.qualifiers.Main
	import com.android.systemui.statusbar.policy.ConfigurationController		import com.android.systemui.statusbar.policy.ConfigurationController
	import com.android.systemui.util.wrapper.DisplayUtilsWrapper		import com.android.systemui.util.wrapper.DisplayUtilsWrapper
	import dagger.Binds		import dagger.Binds
	@@ -162,19 +162,19 @@ abstract class ConfigurationRepositoryModule {
	* injected.		* injected.
	*/		*/
	@Binds		@Binds
	@Deprecated("Use the ConfigurationRepository annotated with @GlobalConfig instead.")		@Deprecated("Use the ConfigurationRepository annotated with @Main instead.")
	@SysUISingleton		@SysUISingleton
	abstract fun provideDefaultConfigRepository(		abstract fun provideDefaultConfigRepository(
	@GlobalConfig configurationRepository: ConfigurationRepository		@Main configurationRepository: ConfigurationRepository
	): ConfigurationRepository		): ConfigurationRepository

	companion object {		companion object {
	@Provides		@Provides
	@GlobalConfig		@Main
	@SysUISingleton		@SysUISingleton
	fun provideGlobalConfigRepository(		fun provideGlobalConfigRepository(
	context: Context,		context: Context,
	@GlobalConfig configurationController: ConfigurationController,		@Main configurationController: ConfigurationController,
	factory: ConfigurationRepositoryImpl.Factory,		factory: ConfigurationRepositoryImpl.Factory,
	): ConfigurationRepository {		): ConfigurationRepository {
	return factory.create(context, configurationController)		return factory.create(context, configurationController)

packages/SystemUI/src/com/android/systemui/dagger/SysUIComponent.java

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -21,7 +21,7 @@ import com.android.systemui.CoreStartable;
	import com.android.systemui.Dependency;		import com.android.systemui.Dependency;
	import com.android.systemui.InitController;		import com.android.systemui.InitController;
	import com.android.systemui.SystemUIAppComponentFactoryBase;		import com.android.systemui.SystemUIAppComponentFactoryBase;
	import com.android.systemui.common.ui.GlobalConfig;		import com.android.systemui.dagger.qualifiers.Main;
	import com.android.systemui.dagger.qualifiers.PerUser;		import com.android.systemui.dagger.qualifiers.PerUser;
	import com.android.systemui.dump.DumpManager;		import com.android.systemui.dump.DumpManager;
	import com.android.systemui.keyguard.KeyguardSliceProvider;		import com.android.systemui.keyguard.KeyguardSliceProvider;
	@@ -128,14 +128,14 @@ public interface SysUIComponent {
	* Creates a ConfigurationController.		* Creates a ConfigurationController.
	*/		*/
	@SysUISingleton		@SysUISingleton
	@GlobalConfig		@Main
	ConfigurationController getConfigurationController();		ConfigurationController getConfigurationController();

	/**		/**
	* Creates a ConfigurationForwarder.		* Creates a ConfigurationForwarder.
	*/		*/
	@SysUISingleton		@SysUISingleton
	@GlobalConfig		@Main
	ConfigurationForwarder getConfigurationForwarder();		ConfigurationForwarder getConfigurationForwarder();

	/**		/**