Merge "wmshell: use Lazy<> for CompatUI dependencies" into main (ce2d6221) · Commits · e / os / android_frameworks_base

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

+8 −8

Original line number	Diff line number	Diff line
		@@ -250,10 +250,10 @@ public abstract class WMShellBaseModule {
		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 @@ public abstract class WMShellBaseModule {
		syncQueue,
		mainExecutor,
		transitionsLazy,
		dockStateReader,
		compatUIConfiguration,
		compatUIShellCommandHandler,
		accessibilityManager));
		dockStateReader.get(),
		compatUIConfiguration.get(),
		compatUIShellCommandHandler.get(),
		accessibilityManager.get()));
		}

		@WMSingleton