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

Commit 3d081274 authored by Julia Tuttle's avatar Julia Tuttle
Browse files

Require explicit @Background for background Executor 

Right now, you can get a @Background Executor (or a couple variants)
without specifying @Background, just by default. This is ambiguous and
error-prone (I found at least one mistake writing this CL!), so remove
those default methods, require every caller to specify that they want to
use the background thread, and update the handful of callers who weren't
specifying as such.

Bug: 325623608
Test: builds, presubmit
Flag: NA
Change-Id: I0a38a530d0bd3075acc6d654be8903f71ff908ad
parent 2e04ffb1

packages/SystemUI/src/com/android/systemui/bluetooth/BroadcastDialogDelegate.java

+5 −4
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ import com.android.settingslib.bluetooth.LocalBluetoothLeBroadcast; 
import com.android.settingslib.bluetooth.LocalBluetoothManager;

import com.android.settingslib.media.MediaOutputConstants;

import com.android.systemui.broadcast.BroadcastSender;

import com.android.systemui.dagger.qualifiers.Background;

import com.android.systemui.media.controls.util.MediaDataUtils;

import com.android.systemui.media.dialog.MediaOutputDialogFactory;

import com.android.systemui.res.R;
@@ -74,7 +75,7 @@ public class BroadcastDialogDelegate implements SystemUIDialog.Delegate { 
    private final SystemUIDialog.Factory mSystemUIDialogFactory;

    private final String mCurrentBroadcastApp;

    private final String mOutputPackageName;

    private final Executor mExecutor;

    private final Executor mBgExecutor;

    private boolean mShouldLaunchLeBroadcastDialog;

    private Button mSwitchBroadcast;
@@ -159,7 +160,7 @@ public class BroadcastDialogDelegate implements SystemUIDialog.Delegate { 
            MediaOutputDialogFactory mediaOutputDialogFactory,

            @Nullable LocalBluetoothManager localBluetoothManager,

            UiEventLogger uiEventLogger,

            Executor executor,

            @Background Executor bgExecutor,

            BroadcastSender broadcastSender,

            SystemUIDialog.Factory systemUIDialogFactory,

            @Assisted(CURRENT_BROADCAST_APP) String currentBroadcastApp,
@@ -171,7 +172,7 @@ public class BroadcastDialogDelegate implements SystemUIDialog.Delegate { 
        mCurrentBroadcastApp = currentBroadcastApp;

        mOutputPackageName = outputPkgName;

        mUiEventLogger = uiEventLogger;

        mExecutor = executor;

        mBgExecutor = bgExecutor;

        mBroadcastSender = broadcastSender;



        if (DEBUG) {
@@ -187,7 +188,7 @@ public class BroadcastDialogDelegate implements SystemUIDialog.Delegate { 
    @Override

    public void onStart(SystemUIDialog dialog) {

        mDialogs.add(dialog);

        registerBroadcastCallBack(mExecutor, mBroadcastCallback);

        registerBroadcastCallBack(mBgExecutor, mBroadcastCallback);

    }



    @Override

packages/SystemUI/src/com/android/systemui/controls/ui/ControlActionCoordinatorImpl.kt

+11 −10
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ import com.android.systemui.broadcast.BroadcastSender 
import com.android.systemui.controls.ControlsMetricsLogger

import com.android.systemui.controls.settings.ControlsSettingsRepository

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.dagger.qualifiers.Background

import com.android.systemui.dagger.qualifiers.Main

import com.android.systemui.plugins.ActivityStarter

import com.android.systemui.statusbar.VibratorHelper
@@ -48,7 +49,7 @@ import javax.inject.Inject 
@SysUISingleton

class ControlActionCoordinatorImpl @Inject constructor(

    private val context: Context,

        private val bgExecutor: DelayableExecutor,

    @Background private val bgExecutor: DelayableExecutor,

    @Main private val uiExecutor: DelayableExecutor,

    private val activityStarter: ActivityStarter,

    private val broadcastSender: BroadcastSender,

packages/SystemUI/src/com/android/systemui/media/taptotransfer/receiver/MediaTttChipControllerReceiver.kt

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ open class MediaTttChipControllerReceiver @Inject constructor( 
        context: Context,

        logger: MediaTttReceiverLogger,

        windowManager: WindowManager,

        mainExecutor: DelayableExecutor,

        @Main mainExecutor: DelayableExecutor,

        accessibilityManager: AccessibilityManager,

        configurationController: ConfigurationController,

        dumpManager: DumpManager,

packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/VisualStabilityCoordinator.java

+2 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import androidx.annotation.VisibleForTesting; 


import com.android.systemui.Dumpable;

import com.android.systemui.dagger.SysUISingleton;

import com.android.systemui.dagger.qualifiers.Background;

import com.android.systemui.dump.DumpManager;

import com.android.systemui.keyguard.WakefulnessLifecycle;

import com.android.systemui.plugins.statusbar.StatusBarStateController;
@@ -92,7 +93,7 @@ public class VisualStabilityCoordinator implements Coordinator, Dumpable { 


    @Inject

    public VisualStabilityCoordinator(

            DelayableExecutor delayableExecutor,

            @Background DelayableExecutor delayableExecutor,

            DumpManager dumpManager,

            HeadsUpManager headsUpManager,

            ShadeAnimationInteractor shadeAnimationInteractor,

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarter.java

+2 −1
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ import com.android.systemui.EventLogTags; 
import com.android.systemui.animation.ActivityTransitionAnimator;

import com.android.systemui.assist.AssistManager;

import com.android.systemui.dagger.SysUISingleton;

import com.android.systemui.dagger.qualifiers.Background;

import com.android.systemui.dagger.qualifiers.DisplayId;

import com.android.systemui.plugins.ActivityStarter;

import com.android.systemui.power.domain.interactor.PowerInteractor;
@@ -138,7 +139,7 @@ public class StatusBarNotificationActivityStarter implements NotificationActivit 
            Context context,

            @DisplayId int displayId,

            Handler mainThreadHandler,

            Executor uiBgExecutor,

            @Background Executor uiBgExecutor,

            NotificationVisibilityProvider visibilityProvider,

            HeadsUpManager headsUpManager,

            ActivityStarter activityStarter,