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

Commit f412cb4c authored by andychou's avatar andychou Committed by android-build-merger
Browse files

Merge "Merge "Fix NetworkControllerDataTest fail if inflateSignalStrength is... 

Merge "Merge "Fix NetworkControllerDataTest fail if inflateSignalStrength is true" into qt-dev am: 1970cfdd" into qt-dev-plus-aosp
am: eadbe7c5

Change-Id: I47c1906428f220c4fb150242db593aff00b848af
parents f9099b63 eadbe7c5

packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java

+2 −1
Original line number Diff line number Diff line
@@ -75,7 +75,8 @@ public class MobileSignalController extends SignalController< 
    private SignalStrength mSignalStrength;

    private MobileIconGroup mDefaultIcons;

    private Config mConfig;

    private boolean mInflateSignalStrengths = false;

    @VisibleForTesting

    boolean mInflateSignalStrengths = false;

    // Some specific carriers have 5GE network which is special LTE CA network.

    private static final int NETWORK_TYPE_LTE_CA_5GE = TelephonyManager.MAX_NETWORK_TYPE + 1;

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

+6 −2
Original line number Diff line number Diff line
@@ -428,8 +428,12 @@ public class NetworkControllerBaseTest extends SysuiTestCase { 


        IconState iconState = iconArg.getValue();



        int state = SignalDrawable.getState(icon, SignalStrength.NUM_SIGNAL_STRENGTH_BINS,

                cutOut);

        int numSignalStrengthBins = SignalStrength.NUM_SIGNAL_STRENGTH_BINS;

        if (mMobileSignalController.mInflateSignalStrengths) {

            numSignalStrengthBins++;

            icon++;

        }

        int state = SignalDrawable.getState(icon, numSignalStrengthBins, cutOut);

        assertEquals("Data icon in status bar", typeIcon, (int) typeIconArg.getValue());

        assertEquals("Signal icon in status bar", state, iconState.icon);

        assertEquals("Visibility in status bar", visible, iconState.visible);