commit ce2d62211f8e2060531e064bbd4a2a825f43b211
author Yifei Zhang <yfz@google.com> Wed Nov 22 02:01:23 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Nov 22 02:01:23 2023 +0000
tree 3ece6caa6a50518356e696f6bb6cd5dfd87e95cc
parent 1488bb3684411f893395fa5772cc9dee82ad106c
parent 61f6bdebe4368745dd0e8a40b396a3179da8d403

Merge "wmshell: use Lazy<> for CompatUI dependencies" into main

libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellBaseModule.java

diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellBaseModule.java b/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellBaseModule.java
index 27dc870..b158f88 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellBaseModule.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellBaseModule.java
@@ -250,10 +250,10 @@
             SyncTransactionQueue syncQueue,
             @ShellMainThread ShellExecutor mainExecutor,
             Lazy<Transitions> transitionsLazy,
-            DockStateReader dockStateReader,
-            CompatUIConfiguration compatUIConfiguration,
-            CompatUIShellCommandHandler compatUIShellCommandHandler,
-            AccessibilityManager accessibilityManager) {
+            Lazy<DockStateReader> dockStateReader,
+            Lazy<CompatUIConfiguration> compatUIConfiguration,
+            Lazy<CompatUIShellCommandHandler> compatUIShellCommandHandler,
+            Lazy<AccessibilityManager> accessibilityManager) {
         if (!context.getResources().getBoolean(R.bool.config_enableCompatUIController)) {
             return Optional.empty();
         }
@@ -268,10 +268,10 @@
                         syncQueue,
                         mainExecutor,
                         transitionsLazy,
-                        dockStateReader,
-                        compatUIConfiguration,
-                        compatUIShellCommandHandler,
-                        accessibilityManager));
+                        dockStateReader.get(),
+                        compatUIConfiguration.get(),
+                        compatUIShellCommandHandler.get(),
+                        accessibilityManager.get()));
     }
 
     @WMSingleton