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

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

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

Change-Id: I9deab54866d79a8b11ffcca40749213b30653697
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Anton Potapov
2022-12-05 18:15:10 +00:00
committed by Automerger Merge Worker
parent 11f489aa71 e64a163f72
commit a3811bfa25
1 changed files with 6 additions and 3 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.Background; import com.android.systemui.dagger.qualifiers.LongRunning;
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;
@@ -224,12 +224,15 @@ 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,
@Background Looper bgLooper, @LongRunning Looper bgLooper,
@Background Executor bgExecutor, @LongRunning Executor bgExecutor,
SubscriptionManager subscriptionManager, SubscriptionManager subscriptionManager,
CallbackHandler callbackHandler, CallbackHandler callbackHandler,
DeviceProvisionedController deviceProvisionedController, DeviceProvisionedController deviceProvisionedController,