Merge "Fix pre-upload warnings in WMShellModule" into main (c16946dc) · Commits · e / os / android_frameworks_base

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

+6 −5

Original line number	Diff line number	Diff line
		@@ -53,7 +53,6 @@ import com.android.wm.shell.apptoweb.AppToWebGenericLinksParser;
		import com.android.wm.shell.apptoweb.AssistContentRequester;
		import com.android.wm.shell.appzoomout.AppZoomOutController;
		import com.android.wm.shell.back.BackAnimationController;
		import com.android.wm.shell.bubbles.bar.BubbleBarDragListener;
		import com.android.wm.shell.bubbles.BubbleController;
		import com.android.wm.shell.bubbles.BubbleData;
		import com.android.wm.shell.bubbles.BubbleDataRepository;
		@@ -61,6 +60,7 @@ import com.android.wm.shell.bubbles.BubbleEducationController;
		import com.android.wm.shell.bubbles.BubbleLogger;
		import com.android.wm.shell.bubbles.BubblePositioner;
		import com.android.wm.shell.bubbles.BubbleResizabilityChecker;
		import com.android.wm.shell.bubbles.bar.BubbleBarDragListener;
		import com.android.wm.shell.bubbles.storage.BubblePersistentRepository;
		import com.android.wm.shell.common.DisplayController;
		import com.android.wm.shell.common.DisplayImeController;
		@@ -170,18 +170,19 @@ import com.android.wm.shell.windowdecor.education.DesktopWindowingEducationPromo
		import com.android.wm.shell.windowdecor.education.DesktopWindowingEducationTooltipController;
		import com.android.wm.shell.windowdecor.tiling.DesktopTilingDecorViewModel;

		import java.util.ArrayList;
		import java.util.List;
		import java.util.Optional;

		import dagger.Binds;
		import dagger.Lazy;
		import dagger.Module;
		import dagger.Provides;

		import kotlinx.coroutines.CoroutineScope;
		import kotlinx.coroutines.ExperimentalCoroutinesApi;
		import kotlinx.coroutines.MainCoroutineDispatcher;

		import java.util.ArrayList;
		import java.util.List;
		import java.util.Optional;

		/**
		* Provides dependencies from {@link com.android.wm.shell}, these dependencies are only accessible
		* from components within the WM subcomponent (can be explicitly exposed to the SysUIComponent, see