Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f5395dc authored by Anton Potapov's avatar Anton Potapov Committed by Automerger Merge Worker
Browse files

Merge "Revert "Move NetworkControllerImpl to @LongRunning thread to prevent... 

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

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



Change-Id: I8e92709657d9a7ca9eb156531f4d0c160c2a0b43
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 36bb7c31 24e16e4a

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

+3 −6
Original line number Diff line number Diff line
@@ -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,