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

Commit c6393850 authored by Evan Laird's avatar Evan Laird
Browse files

Disable `NetworkControllerImpl`'s demo mode based on flag 

Turns off handling of `-e mobile ...` commands from
`DemoModeController` if the new status bar mobile icon pipeline is
enabled.

This will be a requirement to transfer demo mode to the new pipeline

Bug: 249790009
Test: manual; enable demo mode and flag `606`, and send mobile demo
commands

Change-Id: I6beaccc56d2c2b816c2983c3822f0e15b022efe5
parent 5f941ad1

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

+9 −3
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ import com.android.systemui.plugins.log.LogBuffer; 
import com.android.systemui.plugins.log.LogLevel;

import com.android.systemui.qs.tiles.dialog.InternetDialogFactory;

import com.android.systemui.settings.UserTracker;

import com.android.systemui.statusbar.pipeline.StatusBarPipelineFlags;

import com.android.systemui.statusbar.policy.ConfigurationController;

import com.android.systemui.statusbar.policy.DataSaverController;

import com.android.systemui.statusbar.policy.DataSaverControllerImpl;
@@ -193,6 +194,7 @@ public class NetworkControllerImpl extends BroadcastReceiver 
    private final Executor mBgExecutor;

    // Handler that all callbacks are made on.

    private final CallbackHandler mCallbackHandler;

    private final StatusBarPipelineFlags mStatusBarPipelineFlags;



    private int mEmergencySource;

    private boolean mIsEmergency;
@@ -240,6 +242,7 @@ public class NetworkControllerImpl extends BroadcastReceiver 
            TelephonyListenerManager telephonyListenerManager,

            @Nullable WifiManager wifiManager,

            AccessPointControllerImpl accessPointController,

            StatusBarPipelineFlags statusBarPipelineFlags,

            DemoModeController demoModeController,

            CarrierConfigTracker carrierConfigTracker,

            WifiStatusTrackerFactory trackerFactory,
@@ -258,6 +261,7 @@ public class NetworkControllerImpl extends BroadcastReceiver 
                bgExecutor,

                callbackHandler,

                accessPointController,

                statusBarPipelineFlags,

                new DataUsageController(context),

                new SubscriptionDefaults(),

                deviceProvisionedController,
@@ -285,6 +289,7 @@ public class NetworkControllerImpl extends BroadcastReceiver 
            Executor bgExecutor,

            CallbackHandler callbackHandler,

            AccessPointControllerImpl accessPointController,

            StatusBarPipelineFlags statusBarPipelineFlags,

            DataUsageController dataUsageController,

            SubscriptionDefaults defaultsHandler,

            DeviceProvisionedController deviceProvisionedController,
@@ -306,6 +311,7 @@ public class NetworkControllerImpl extends BroadcastReceiver 
        mBgLooper = bgLooper;

        mBgExecutor = bgExecutor;

        mCallbackHandler = callbackHandler;

        mStatusBarPipelineFlags = statusBarPipelineFlags;

        mDataSaverController = new DataSaverControllerImpl(context);

        mBroadcastDispatcher = broadcastDispatcher;

        mMobileFactory = mobileFactory;
@@ -1331,7 +1337,7 @@ public class NetworkControllerImpl extends BroadcastReceiver 
            mWifiSignalController.notifyListeners();

        }

        String sims = args.getString("sims");

        if (sims != null) {

        if (sims != null && !mStatusBarPipelineFlags.useNewMobileIcons()) {

            int num = MathUtils.constrain(Integer.parseInt(sims), 1, 8);

            List<SubscriptionInfo> subs = new ArrayList<>();

            if (num != mMobileSignalControllers.size()) {
@@ -1354,7 +1360,7 @@ public class NetworkControllerImpl extends BroadcastReceiver 
            mCallbackHandler.setNoSims(mHasNoSubs, mSimDetected);

        }

        String mobile = args.getString("mobile");

        if (mobile != null) {

        if (mobile != null && !mStatusBarPipelineFlags.useNewMobileIcons()) {

            boolean show = mobile.equals("show");

            String datatype = args.getString("datatype");

            String slotString = args.getString("slot");
@@ -1439,7 +1445,7 @@ public class NetworkControllerImpl extends BroadcastReceiver 
            controller.notifyListeners();

        }

        String carrierNetworkChange = args.getString("carriernetworkchange");

        if (carrierNetworkChange != null) {

        if (carrierNetworkChange != null && !mStatusBarPipelineFlags.useNewMobileIcons()) {

            boolean show = carrierNetworkChange.equals("show");

            for (int i = 0; i < mMobileSignalControllers.size(); i++) {

                MobileSignalController controller = mMobileSignalControllers.valueAt(i);

packages/SystemUI/tests/src/com/android/systemui/statusbar/connectivity/NetworkControllerBaseTest.java

+2 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ import com.android.systemui.demomode.DemoModeController; 
import com.android.systemui.dump.DumpManager;

import com.android.systemui.plugins.log.LogBuffer;

import com.android.systemui.settings.UserTracker;

import com.android.systemui.statusbar.pipeline.StatusBarPipelineFlags;

import com.android.systemui.statusbar.pipeline.mobile.util.FakeMobileMappingsProxy;

import com.android.systemui.statusbar.policy.DeviceProvisionedController;

import com.android.systemui.statusbar.policy.DeviceProvisionedController.DeviceProvisionedListener;
@@ -245,6 +246,7 @@ public class NetworkControllerBaseTest extends SysuiTestCase { 
                mFakeExecutor,

                mCallbackHandler,

                mock(AccessPointControllerImpl.class),

                mock(StatusBarPipelineFlags.class),

                mock(DataUsageController.class),

                mMockSubDefaults,

                mMockProvisionController,

packages/SystemUI/tests/src/com/android/systemui/statusbar/connectivity/NetworkControllerDataTest.java

+2 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ import com.android.settingslib.mobile.TelephonyIcons; 
import com.android.settingslib.net.DataUsageController;

import com.android.systemui.dump.DumpManager;

import com.android.systemui.plugins.log.LogBuffer;

import com.android.systemui.statusbar.pipeline.StatusBarPipelineFlags;

import com.android.systemui.statusbar.policy.DeviceProvisionedController;

import com.android.systemui.util.CarrierConfigTracker;
@@ -150,6 +151,7 @@ public class NetworkControllerDataTest extends NetworkControllerBaseTest { 
                mFakeExecutor,

                mCallbackHandler,

                mock(AccessPointControllerImpl.class),

                mock(StatusBarPipelineFlags.class),

                mock(DataUsageController.class),

                mMockSubDefaults,

                mock(DeviceProvisionedController.class),

packages/SystemUI/tests/src/com/android/systemui/statusbar/connectivity/NetworkControllerSignalTest.java

+6 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ import com.android.settingslib.net.DataUsageController; 
import com.android.systemui.R;

import com.android.systemui.dump.DumpManager;

import com.android.systemui.plugins.log.LogBuffer;

import com.android.systemui.statusbar.pipeline.StatusBarPipelineFlags;

import com.android.systemui.statusbar.policy.DeviceProvisionedController;

import com.android.systemui.util.CarrierConfigTracker;
@@ -78,6 +79,7 @@ public class NetworkControllerSignalTest extends NetworkControllerBaseTest { 
                mFakeExecutor,

                mCallbackHandler,

                mock(AccessPointControllerImpl.class),

                mock(StatusBarPipelineFlags.class),

                mock(DataUsageController.class),

                mMockSubDefaults,

                mMockProvisionController,
@@ -115,6 +117,7 @@ public class NetworkControllerSignalTest extends NetworkControllerBaseTest { 
                mFakeExecutor,

                mCallbackHandler,

                mock(AccessPointControllerImpl.class),

                mock(StatusBarPipelineFlags.class),

                mock(DataUsageController.class),

                mMockSubDefaults,

                mMockProvisionController,
@@ -150,6 +153,7 @@ public class NetworkControllerSignalTest extends NetworkControllerBaseTest { 
                mFakeExecutor,

                mCallbackHandler,

                mock(AccessPointControllerImpl.class),

                mock(StatusBarPipelineFlags.class),

                mock(DataUsageController.class),

                mMockSubDefaults,

                mock(DeviceProvisionedController.class),
@@ -188,6 +192,7 @@ public class NetworkControllerSignalTest extends NetworkControllerBaseTest { 
                mFakeExecutor,

                mCallbackHandler,

                mock(AccessPointControllerImpl.class),

                mock(StatusBarPipelineFlags.class),

                mock(DataUsageController.class),

                mMockSubDefaults,

                mock(DeviceProvisionedController.class),
@@ -274,6 +279,7 @@ public class NetworkControllerSignalTest extends NetworkControllerBaseTest { 
                mFakeExecutor,

                mCallbackHandler,

                mock(AccessPointControllerImpl.class),

                mock(StatusBarPipelineFlags.class),

                mock(DataUsageController.class),

                mMockSubDefaults,

                mock(DeviceProvisionedController.class),