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
This commit is contained in:
Colin Cross
2023-08-02 15:42:51 -07:00
parent e502678bd1
commit 7f67b8602b
7 changed files with 12 additions and 12 deletions

View File

@@ -51,7 +51,7 @@ interface NotifPipelineChoreographer {
object NotifPipelineChoreographerModule
@Module
private interface PrivateModule {
interface PrivateModule {
@Binds
fun bindChoreographer(impl: NotifPipelineChoreographerImpl): NotifPipelineChoreographer
}
@@ -59,7 +59,7 @@ private interface PrivateModule {
private const val TIMEOUT_MS: Long = 100
@SysUISingleton
private class NotifPipelineChoreographerImpl @Inject constructor(
class NotifPipelineChoreographerImpl @Inject constructor(
private val viewChoreographer: Choreographer,
@Main private val executor: DelayableExecutor
) : NotifPipelineChoreographer {

View File

@@ -38,7 +38,7 @@ import javax.inject.Inject
interface SensitiveContentCoordinatorModule
@Module
private interface PrivateSensitiveContentCoordinatorModule {
interface PrivateSensitiveContentCoordinatorModule {
@Binds
fun bindCoordinator(impl: SensitiveContentCoordinatorImpl): SensitiveContentCoordinator
}
@@ -47,7 +47,7 @@ private interface PrivateSensitiveContentCoordinatorModule {
interface SensitiveContentCoordinator : Coordinator
@CoordinatorScope
private class SensitiveContentCoordinatorImpl @Inject constructor(
class SensitiveContentCoordinatorImpl @Inject constructor(
private val dynamicPrivacyController: DynamicPrivacyController,
private val lockscreenUserManager: NotificationLockscreenUserManager,
private val keyguardUpdateMonitor: KeyguardUpdateMonitor,

View File

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

View File

@@ -38,7 +38,7 @@ interface SectionHeaderController {
}
@SectionHeaderScope
internal class SectionHeaderNodeControllerImpl @Inject constructor(
class SectionHeaderNodeControllerImpl @Inject constructor(
@NodeLabel override val nodeLabel: String,
private val layoutInflater: LayoutInflater,
@HeaderText @StringRes private val headerTextResId: Int,
@@ -103,4 +103,4 @@ internal class SectionHeaderNodeControllerImpl @Inject constructor(
override fun offerToKeepInParentForAnimation(): Boolean = false
override fun removeFromParentIfKeptForAnimation(): Boolean = false
override fun resetKeepInParentForAnimation() {}
}
}

View File

@@ -145,7 +145,7 @@ interface SectionHeaderControllerSubcomponent {
}
@Module
private abstract class SectionHeaderBindingModule {
abstract class SectionHeaderBindingModule {
@Binds abstract fun bindsNodeController(impl: SectionHeaderNodeControllerImpl): NodeController
@Binds abstract fun bindsSectionHeaderController(
impl: SectionHeaderNodeControllerImpl
@@ -182,4 +182,4 @@ annotation class HeaderClickAction
@Scope
@Retention(AnnotationRetention.BINARY)
annotation class SectionHeaderScope
annotation class SectionHeaderScope

View File

@@ -57,7 +57,7 @@ interface KeyguardNotificationVisibilityProvider {
object KeyguardNotificationVisibilityProviderModule
@Module
private interface KeyguardNotificationVisibilityProviderImplModule {
interface KeyguardNotificationVisibilityProviderImplModule {
@Binds
fun bindImpl(impl: KeyguardNotificationVisibilityProviderImpl):
KeyguardNotificationVisibilityProvider
@@ -69,7 +69,7 @@ private interface KeyguardNotificationVisibilityProviderImplModule {
}
@SysUISingleton
private class KeyguardNotificationVisibilityProviderImpl @Inject constructor(
class KeyguardNotificationVisibilityProviderImpl @Inject constructor(
@Main private val handler: Handler,
private val keyguardStateController: KeyguardStateController,
private val lockscreenUserManager: NotificationLockscreenUserManager,

View File

@@ -41,7 +41,7 @@ interface RemoteInputViewSubcomponent {
}
@Module
private interface InternalRemoteInputViewModule {
interface InternalRemoteInputViewModule {
@Binds
fun bindController(impl: RemoteInputViewControllerImpl): RemoteInputViewController
}