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

Commit eadbe7c5 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
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
parents a76674f1 0f5a4d6c

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);