From 4db94a0a625199941866463b255a97c9e49fad9b Mon Sep 17 00:00:00 2001 From: Anton Potapov Date: Fri, 2 Dec 2022 18:05:06 +0000 Subject: [PATCH] Move NetworkControllerImpl to @LongRunning thread to prevent @Background from being stuck Fixes: 246456655 Test: Manual 1. Reboot the device 2. Open the QS panel right after boot Change-Id: I21dab08e46f1bbe3089d47bb7ea497c98cea24ff --- .../statusbar/connectivity/NetworkControllerImpl.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 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 fe488a9b8336e..97a47b5d1407d 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.Background; +import com.android.systemui.dagger.qualifiers.LongRunning; import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.demomode.DemoMode; import com.android.systemui.demomode.DemoModeController; @@ -224,12 +224,15 @@ 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, - @Background Looper bgLooper, - @Background Executor bgExecutor, + @LongRunning Looper bgLooper, + @LongRunning Executor bgExecutor, SubscriptionManager subscriptionManager, CallbackHandler callbackHandler, DeviceProvisionedController deviceProvisionedController,