From 91f150386d255263512d4f246bd266a41314ec97 Mon Sep 17 00:00:00 2001
From: Evan Laird <evanlaird@google.com>
Date: Mon, 26 Jun 2023 12:32:35 -0400
Subject: [PATCH] [Decor] Remove the now-unused main executor

Bug: 285941724
Test: ScreenDecorationsTest
Change-Id: I7bffeb56c9ed9a25aa50b10f23f7a13ebb0cc47d
---
 .../SystemUI/src/com/android/systemui/ScreenDecorations.java | 5 -----
 .../src/com/android/systemui/ScreenDecorationsTest.java      | 4 ++--
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/ScreenDecorations.java b/packages/SystemUI/src/com/android/systemui/ScreenDecorations.java
index a03e4b15f9b76..de7a669003552 100644
--- a/packages/SystemUI/src/com/android/systemui/ScreenDecorations.java
+++ b/packages/SystemUI/src/com/android/systemui/ScreenDecorations.java
@@ -69,7 +69,6 @@ import com.android.internal.util.Preconditions;
 import com.android.settingslib.Utils;
 import com.android.systemui.biometrics.AuthController;
 import com.android.systemui.dagger.SysUISingleton;
-import com.android.systemui.dagger.qualifiers.Main;
 import com.android.systemui.decor.CutoutDecorProviderFactory;
 import com.android.systemui.decor.DebugRoundedCornerDelegate;
 import com.android.systemui.decor.DebugRoundedCornerModel;
@@ -98,7 +97,6 @@ import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
-import java.util.concurrent.Executor;
 
 import javax.inject.Inject;
 
@@ -133,7 +131,6 @@ public class ScreenDecorations implements CoreStartable, Dumpable {
     @VisibleForTesting
     protected boolean mIsRegistered;
     private final Context mContext;
-    private final Executor mMainExecutor;
     private final CommandRegistry mCommandRegistry;
     private final SecureSettings mSecureSettings;
     @VisibleForTesting
@@ -317,7 +314,6 @@ public class ScreenDecorations implements CoreStartable, Dumpable {
 
     @Inject
     public ScreenDecorations(Context context,
-            @Main Executor mainExecutor,
             SecureSettings secureSettings,
             CommandRegistry commandRegistry,
             UserTracker userTracker,
@@ -329,7 +325,6 @@ public class ScreenDecorations implements CoreStartable, Dumpable {
             ScreenDecorationsLogger logger,
             AuthController authController) {
         mContext = context;
-        mMainExecutor = mainExecutor;
         mSecureSettings = secureSettings;
         mCommandRegistry = commandRegistry;
         mUserTracker = userTracker;
diff --git a/packages/SystemUI/tests/src/com/android/systemui/ScreenDecorationsTest.java b/packages/SystemUI/tests/src/com/android/systemui/ScreenDecorationsTest.java
index c1a6f28cdea6c..796e66514afe7 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/ScreenDecorationsTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/ScreenDecorationsTest.java
@@ -234,7 +234,7 @@ public class ScreenDecorationsTest extends SysuiTestCase {
                 mExecutor,
                 new ScreenDecorationsLogger(logcatLogBuffer("TestLogBuffer"))));
 
-        mScreenDecorations = spy(new ScreenDecorations(mContext, mExecutor, mSecureSettings,
+        mScreenDecorations = spy(new ScreenDecorations(mContext, mSecureSettings,
                 mCommandRegistry, mUserTracker, mDisplayTracker, mDotViewController,
                 mThreadFactory,
                 mPrivacyDotDecorProviderFactory, mFaceScanningProviderFactory,
@@ -1230,7 +1230,7 @@ public class ScreenDecorationsTest extends SysuiTestCase {
         mFaceScanningProviders.add(mFaceScanningDecorProvider);
         when(mFaceScanningProviderFactory.getProviders()).thenReturn(mFaceScanningProviders);
         when(mFaceScanningProviderFactory.getHasProviders()).thenReturn(true);
-        ScreenDecorations screenDecorations = new ScreenDecorations(mContext, mExecutor,
+        ScreenDecorations screenDecorations = new ScreenDecorations(mContext,
                 mSecureSettings, mCommandRegistry, mUserTracker, mDisplayTracker,
                 mDotViewController,
                 mThreadFactory, mPrivacyDotDecorProviderFactory, mFaceScanningProviderFactory,