Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f67b860 authored Aug 02, 2023 by Colin Cross

Fix SystemUI for dagger 2.47

Dagger 2.47 has envorced a requirement that modules cannot be private
(b/283273372).  This causes errors when compiling SystemUI, for example

com/android/systemui/statusbar/notification/collection/PrivateModule.java:14: error: Modules cannot be private.
abstract interface PrivateModule {
                   ^

Make the failing modules public.

Bug: 293884229
Test: m SystemUI
Change-Id: I1d8e7bd2ad40389a26082b353ab9574b1bbdd50f

parent e502678b

packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotifPipelineChoreographer.kt

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -51,7 +51,7 @@ interface NotifPipelineChoreographer {
	object NotifPipelineChoreographerModule		object NotifPipelineChoreographerModule

	@Module		@Module
	private interface PrivateModule {		interface PrivateModule {
	@Binds		@Binds
	fun bindChoreographer(impl: NotifPipelineChoreographerImpl): NotifPipelineChoreographer		fun bindChoreographer(impl: NotifPipelineChoreographerImpl): NotifPipelineChoreographer
	}		}
	@@ -59,7 +59,7 @@ private interface PrivateModule {
	private const val TIMEOUT_MS: Long = 100		private const val TIMEOUT_MS: Long = 100

	@SysUISingleton		@SysUISingleton
	private class NotifPipelineChoreographerImpl @Inject constructor(		class NotifPipelineChoreographerImpl @Inject constructor(
	private val viewChoreographer: Choreographer,		private val viewChoreographer: Choreographer,
	@Main private val executor: DelayableExecutor		@Main private val executor: DelayableExecutor
	) : NotifPipelineChoreographer {		) : NotifPipelineChoreographer {

packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/SensitiveContentCoordinator.kt

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -38,7 +38,7 @@ import javax.inject.Inject
	interface SensitiveContentCoordinatorModule		interface SensitiveContentCoordinatorModule

	@Module		@Module
	private interface PrivateSensitiveContentCoordinatorModule {		interface PrivateSensitiveContentCoordinatorModule {
	@Binds		@Binds
	fun bindCoordinator(impl: SensitiveContentCoordinatorImpl): SensitiveContentCoordinator		fun bindCoordinator(impl: SensitiveContentCoordinatorImpl): SensitiveContentCoordinator
	}		}
	@@ -47,7 +47,7 @@ private interface PrivateSensitiveContentCoordinatorModule {
	interface SensitiveContentCoordinator : Coordinator		interface SensitiveContentCoordinator : Coordinator

	@CoordinatorScope		@CoordinatorScope
	private class SensitiveContentCoordinatorImpl @Inject constructor(		class SensitiveContentCoordinatorImpl @Inject constructor(
	private val dynamicPrivacyController: DynamicPrivacyController,		private val dynamicPrivacyController: DynamicPrivacyController,
	private val lockscreenUserManager: NotificationLockscreenUserManager,		private val lockscreenUserManager: NotificationLockscreenUserManager,
	private val keyguardUpdateMonitor: KeyguardUpdateMonitor,		private val keyguardUpdateMonitor: KeyguardUpdateMonitor,

packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/dagger/CoordinatorsModule.kt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -50,7 +50,7 @@ interface CoordinatorsSubcomponent {
	@Module(includes = [		@Module(includes = [
	SensitiveContentCoordinatorModule::class,		SensitiveContentCoordinatorModule::class,
	])		])
	private abstract class InternalCoordinatorsModule {		abstract class InternalCoordinatorsModule {
	@Binds		@Binds
	@Internal		@Internal
	abstract fun bindNotifCoordinators(impl: NotifCoordinatorsImpl): NotifCoordinators		abstract fun bindNotifCoordinators(impl: NotifCoordinatorsImpl): NotifCoordinators

packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/render/SectionHeaderController.kt

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -38,7 +38,7 @@ interface SectionHeaderController {
	}		}

	@SectionHeaderScope		@SectionHeaderScope
	internal class SectionHeaderNodeControllerImpl @Inject constructor(		class SectionHeaderNodeControllerImpl @Inject constructor(
	@NodeLabel override val nodeLabel: String,		@NodeLabel override val nodeLabel: String,
	private val layoutInflater: LayoutInflater,		private val layoutInflater: LayoutInflater,
	@HeaderText @StringRes private val headerTextResId: Int,		@HeaderText @StringRes private val headerTextResId: Int,

packages/SystemUI/src/com/android/systemui/statusbar/notification/dagger/NotificationSectionHeadersModule.kt

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -145,7 +145,7 @@ interface SectionHeaderControllerSubcomponent {
	}		}

	@Module		@Module
	private abstract class SectionHeaderBindingModule {		abstract class SectionHeaderBindingModule {
	@Binds abstract fun bindsNodeController(impl: SectionHeaderNodeControllerImpl): NodeController		@Binds abstract fun bindsNodeController(impl: SectionHeaderNodeControllerImpl): NodeController
	@Binds abstract fun bindsSectionHeaderController(		@Binds abstract fun bindsSectionHeaderController(
	impl: SectionHeaderNodeControllerImpl		impl: SectionHeaderNodeControllerImpl