Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 91f15038 authored by Evan Laird's avatar Evan Laird
Browse files

[Decor] Remove the now-unused main executor 

Bug: 285941724
Test: ScreenDecorationsTest
Change-Id: I7bffeb56c9ed9a25aa50b10f23f7a13ebb0cc47d
parent 7128c6aa

packages/SystemUI/src/com/android/systemui/ScreenDecorations.java

+0 −5
Original line number Diff line number Diff line
@@ -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;

packages/SystemUI/tests/src/com/android/systemui/ScreenDecorationsTest.java

+2 −2
Original line number Diff line number Diff line
@@ -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,