Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Move NetworkControllerImpl to @LongRunning thread to prevent @Background from being stuck"" into tm-qpr-dev

Browse Source
This commit is contained in:
Anton Potapov
2022-12-12 15:07:55 +00:00
committed by Android (Google) Code Review
parent f537e31939 047f064575
commit 24e16e4a21
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/SystemUI/src/com/android/systemui/statusbar/connectivity/NetworkControllerImpl.java
View File

@@ -68,7 +68,7 @@ import com.android.systemui.Dumpable;
import com.android.systemui.R; import com.android.systemui.R;
import com.android.systemui.broadcast.BroadcastDispatcher; import com.android.systemui.broadcast.BroadcastDispatcher;
import com.android.systemui.dagger.SysUISingleton; 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.dagger.qualifiers.Main;
import com.android.systemui.demomode.DemoMode; import com.android.systemui.demomode.DemoMode;
import com.android.systemui.demomode.DemoModeController; import com.android.systemui.demomode.DemoModeController;
@@ -226,15 +226,12 @@ public class NetworkControllerImpl extends BroadcastReceiver
/** /**
* Construct this controller object and register for updates. * 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 @Inject
public NetworkControllerImpl( public NetworkControllerImpl(
Context context, Context context,
@LongRunning Looper bgLooper, @Background Looper bgLooper,
@LongRunning Executor bgExecutor, @Background Executor bgExecutor,
SubscriptionManager subscriptionManager, SubscriptionManager subscriptionManager,
CallbackHandler callbackHandler, CallbackHandler callbackHandler,
DeviceProvisionedController deviceProvisionedController, DeviceProvisionedController deviceProvisionedController,