From a06b8f6f912cdd101a5d5b4f74162735b0bf42bd Mon Sep 17 00:00:00 2001
From: wilsonshih <wilsonshih@google.com>
Date: Mon, 15 Mar 2021 15:59:01 +0800
Subject: [PATCH] Construct StartingWindowController with SplashScreenThread

Correct the wrong thread when resolving merge conflicts

Bug: 173975965
Test: build/flash
Change-Id: I0014988412ced1a385c0a69f6c605e87129de719
---
 .../src/com/android/systemui/wmshell/WMShellBaseModule.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/wmshell/WMShellBaseModule.java b/packages/SystemUI/src/com/android/systemui/wmshell/WMShellBaseModule.java
index 1d18750f1fdf7..ddfa63a33149f 100644
--- a/packages/SystemUI/src/com/android/systemui/wmshell/WMShellBaseModule.java
+++ b/packages/SystemUI/src/com/android/systemui/wmshell/WMShellBaseModule.java
@@ -480,7 +480,7 @@ public abstract class WMShellBaseModule {
     @WMSingleton
     @Provides
     static StartingWindowController provideStartingWindowController(Context context,
-            @ShellAnimationThread ShellExecutor executor, TransactionPool pool) {
+            @ShellSplashscreenThread ShellExecutor executor, TransactionPool pool) {
         return new StartingWindowController(context, executor, pool);
     }