Merge "Revert "Move NetworkControllerImpl to @LongRunning thread to prevent @Background from being stuck"" into tm-qpr-dev am: 24e16e4a21 am: 4f5395dc32

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20689186

Change-Id: Ib39d434affdf1841260f0c9643218ef43939285f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Anton Potapov
2022-12-12 16:01:54 +00:00
committed by Automerger Merge Worker

View File

@@ -68,7 +68,7 @@ import com.android.systemui.Dumpable;
import com.android.systemui.R;
import com.android.systemui.broadcast.BroadcastDispatcher;
import com.android.systemui.dagger.SysUISingleton;
import com.android.systemui.dagger.qualifiers.LongRunning;
import com.android.systemui.dagger.qualifiers.Background;
import com.android.systemui.dagger.qualifiers.Main;
import com.android.systemui.demomode.DemoMode;
import com.android.systemui.demomode.DemoModeController;
@@ -225,15 +225,12 @@ public class NetworkControllerImpl extends BroadcastReceiver
/**
* Construct this controller object and register for updates.
*
* {@code @LongRunning} looper and bgExecutor instead {@code @Background} ones are used to
* address the b/246456655. This can be reverted after b/240663726 is fixed.
*/
@Inject
public NetworkControllerImpl(
Context context,
@LongRunning Looper bgLooper,
@LongRunning Executor bgExecutor,
@Background Looper bgLooper,
@Background Executor bgExecutor,
SubscriptionManager subscriptionManager,
CallbackHandler callbackHandler,
DeviceProvisionedController deviceProvisionedController,