From 123d7cb64d99d34a5cf66e9205b72f6a50a96155 Mon Sep 17 00:00:00 2001
From: Alejandro Nijamkin <nijamkin@google.com>
Date: Mon, 17 Oct 2022 17:12:22 -0700
Subject: [PATCH] Lazy UserSwitcherDialogCoordinator.

Makes all class dependencies lazy and turns on the refactored code.

The motivation was the attached bug, where we've seen a regression in
boot times when turning on the refactored code flags. The theory is that
this core startable is pulling in a lot of code that's doing work in its
constructor(s). By making it lazy, that's delayed until the core
startable system tells this class to start.

Bug: 253435919
Test: Manually verified that the user switcher works.
Change-Id: I8957d9a98ca8e949f888b84c9d0d58d51f15f9d5
---
 .../dialog/UserSwitcherDialogCoordinator.kt   | 45 ++++++++++---------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/user/ui/dialog/UserSwitcherDialogCoordinator.kt b/packages/SystemUI/src/com/android/systemui/user/ui/dialog/UserSwitcherDialogCoordinator.kt
index 91c592177d193..f7e19c0ca8101 100644
--- a/packages/SystemUI/src/com/android/systemui/user/ui/dialog/UserSwitcherDialogCoordinator.kt
+++ b/packages/SystemUI/src/com/android/systemui/user/ui/dialog/UserSwitcherDialogCoordinator.kt
@@ -30,6 +30,7 @@ import com.android.systemui.flags.Flags
 import com.android.systemui.plugins.FalsingManager
 import com.android.systemui.user.domain.interactor.UserInteractor
 import com.android.systemui.user.domain.model.ShowDialogRequestModel
+import dagger.Lazy
 import javax.inject.Inject
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.collect
@@ -41,19 +42,19 @@ import kotlinx.coroutines.launch
 class UserSwitcherDialogCoordinator
 @Inject
 constructor(
-    @Application private val context: Context,
-    @Application private val applicationScope: CoroutineScope,
-    private val falsingManager: FalsingManager,
-    private val broadcastSender: BroadcastSender,
-    private val dialogLaunchAnimator: DialogLaunchAnimator,
-    private val interactor: UserInteractor,
-    private val featureFlags: FeatureFlags,
+    @Application private val context: Lazy<Context>,
+    @Application private val applicationScope: Lazy<CoroutineScope>,
+    private val falsingManager: Lazy<FalsingManager>,
+    private val broadcastSender: Lazy<BroadcastSender>,
+    private val dialogLaunchAnimator: Lazy<DialogLaunchAnimator>,
+    private val interactor: Lazy<UserInteractor>,
+    private val featureFlags: Lazy<FeatureFlags>,
 ) : CoreStartable {
 
     private var currentDialog: Dialog? = null
 
     override fun start() {
-        if (featureFlags.isEnabled(Flags.USER_INTERACTOR_AND_REPO_USE_CONTROLLER)) {
+        if (featureFlags.get().isEnabled(Flags.USER_INTERACTOR_AND_REPO_USE_CONTROLLER)) {
             return
         }
 
@@ -62,8 +63,8 @@ constructor(
     }
 
     private fun startHandlingDialogShowRequests() {
-        applicationScope.launch {
-            interactor.dialogShowRequests.filterNotNull().collect { request ->
+        applicationScope.get().launch {
+            interactor.get().dialogShowRequests.filterNotNull().collect { request ->
                 currentDialog?.let {
                     if (it.isShowing) {
                         it.cancel()
@@ -74,48 +75,48 @@ constructor(
                     when (request) {
                         is ShowDialogRequestModel.ShowAddUserDialog ->
                             AddUserDialog(
-                                context = context,
+                                context = context.get(),
                                 userHandle = request.userHandle,
                                 isKeyguardShowing = request.isKeyguardShowing,
                                 showEphemeralMessage = request.showEphemeralMessage,
-                                falsingManager = falsingManager,
-                                broadcastSender = broadcastSender,
-                                dialogLaunchAnimator = dialogLaunchAnimator,
+                                falsingManager = falsingManager.get(),
+                                broadcastSender = broadcastSender.get(),
+                                dialogLaunchAnimator = dialogLaunchAnimator.get(),
                             )
                         is ShowDialogRequestModel.ShowUserCreationDialog ->
                             UserCreatingDialog(
-                                context,
+                                context.get(),
                                 request.isGuest,
                             )
                         is ShowDialogRequestModel.ShowExitGuestDialog ->
                             ExitGuestDialog(
-                                context = context,
+                                context = context.get(),
                                 guestUserId = request.guestUserId,
                                 isGuestEphemeral = request.isGuestEphemeral,
                                 targetUserId = request.targetUserId,
                                 isKeyguardShowing = request.isKeyguardShowing,
-                                falsingManager = falsingManager,
-                                dialogLaunchAnimator = dialogLaunchAnimator,
+                                falsingManager = falsingManager.get(),
+                                dialogLaunchAnimator = dialogLaunchAnimator.get(),
                                 onExitGuestUserListener = request.onExitGuestUser,
                             )
                     }
 
                 currentDialog?.show()
-                interactor.onDialogShown()
+                interactor.get().onDialogShown()
             }
         }
     }
 
     private fun startHandlingDialogDismissRequests() {
-        applicationScope.launch {
-            interactor.dialogDismissRequests.filterNotNull().collect {
+        applicationScope.get().launch {
+            interactor.get().dialogDismissRequests.filterNotNull().collect {
                 currentDialog?.let {
                     if (it.isShowing) {
                         it.cancel()
                     }
                 }
 
-                interactor.onDialogDismissed()
+                interactor.get().onDialogDismissed()
             }
         }
     }