Merge ab/AP4A.240925.013 into aosp-main-future
Bug: 370570306
Merged-In: Ie3d75a1e0b2843bee739f1247c4d526992d70298
Change-Id: I79b03ebf9ddba59891c494f842257e7e6e83b00c
diff --git a/src/com/android/systemui/tv/dagger/TvSystemUIModule.kt b/src/com/android/systemui/tv/dagger/TvSystemUIModule.kt
index 2a730ad..fe17eb9 100644
--- a/src/com/android/systemui/tv/dagger/TvSystemUIModule.kt
+++ b/src/com/android/systemui/tv/dagger/TvSystemUIModule.kt
@@ -31,8 +31,8 @@
import com.android.systemui.dock.DockManager
import com.android.systemui.dock.DockManagerImpl
import com.android.systemui.doze.DozeHost
-import com.android.systemui.media.dialog.MediaSwitchingController
import com.android.systemui.media.dialog.MediaOutputDialogManager
+import com.android.systemui.media.dialog.MediaSwitchingController
import com.android.systemui.media.muteawait.MediaMuteAwaitConnectionCli
import com.android.systemui.media.nearby.NearbyMediaDevicesManager
import com.android.systemui.navigationbar.gestural.GestureModule
@@ -44,6 +44,7 @@
import com.android.systemui.qs.tileimpl.QSFactoryImpl
import com.android.systemui.screenshot.ReferenceScreenshotModule
import com.android.systemui.settings.MultiUserUtilsModule
+import com.android.systemui.settings.UserTracker
import com.android.systemui.shade.ShadeEmptyImplModule
import com.android.systemui.statusbar.KeyboardShortcutsModule
import com.android.systemui.statusbar.NotificationListener
@@ -81,8 +82,8 @@
import dagger.multibindings.ClassKey
import dagger.multibindings.IntoMap
import dagger.multibindings.IntoSet
-import kotlinx.coroutines.ExperimentalCoroutinesApi
import javax.inject.Named
+import kotlinx.coroutines.ExperimentalCoroutinesApi
/**
* A TV specific version of [ReferenceSystemUIModule].
@@ -200,9 +201,13 @@
@Provides
@SysUISingleton
fun provideIndividualSensorPrivacyController(
- sensorPrivacyManager: SensorPrivacyManager
+ sensorPrivacyManager: SensorPrivacyManager,
+ userTracker: UserTracker
): IndividualSensorPrivacyController =
- IndividualSensorPrivacyControllerImpl(sensorPrivacyManager).apply { init() }
+ IndividualSensorPrivacyControllerImpl(
+ sensorPrivacyManager,
+ userTracker
+ ).apply { init() }
@SysUISingleton
@Provides
@@ -232,7 +237,12 @@
dialogTransitionAnimator: DialogTransitionAnimator,
mediaSwitchingControllerFactory: MediaSwitchingController.Factory,
): MediaOutputDialogManager =
- TvMediaOutputDialogManager(context, broadcastSender, uiEventLogger,
- dialogTransitionAnimator, mediaSwitchingControllerFactory)
+ TvMediaOutputDialogManager(
+ context,
+ broadcastSender,
+ uiEventLogger,
+ dialogTransitionAnimator,
+ mediaSwitchingControllerFactory
+ )
}
}
