From 047f064575038942b7e1f2f1e1ea737393a79fe4 Mon Sep 17 00:00:00 2001 From: Anton Potapov Date: Fri, 9 Dec 2022 10:10:50 +0000 Subject: [PATCH] Revert "Move NetworkControllerImpl to @LongRunning thread to prevent @Background from being stuck" This reverts commit 4db94a0a625199941866463b255a97c9e49fad9b. Reason for revert: Performance regression found: b/261773357. I'll rework this with a completely separated thread. Change-Id: I1ea65fdeeeb1693ba283f446dee9ba92d148442d Fixes: 261773357 --- .../statusbar/connectivity/NetworkControllerImpl.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/connectivity/NetworkControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/connectivity/NetworkControllerImpl.java index 362764d1f89e7..57add75ee38a1 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/connectivity/NetworkControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/connectivity/NetworkControllerImpl.java @@ -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; @@ -226,15 +226,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,