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

Commit 8969817a authored by Jason Monk's avatar Jason Monk Committed by Android (Google) Code Review
Browse files

Merge "Fix roaming icon when not default signal" into mnc-dev

parents 5d21f416 61633f18

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

+2 −1
Original line number Diff line number Diff line
@@ -223,7 +223,8 @@ public class MobileSignalController extends SignalController< 
        boolean activityOut = mCurrentState.dataConnected

                        && !mCurrentState.carrierNetworkChangeMode

                        && mCurrentState.activityOut;

        showDataIcon &= mCurrentState.isDefault;

        showDataIcon &= mCurrentState.isDefault

                || mCurrentState.iconGroup == TelephonyIcons.ROAMING;

        int typeIcon = showDataIcon ? icons.mDataType : 0;

        mCallbackHandler.setMobileDataIndicators(statusIcon, qsIcon, typeIcon, qsTypeIcon,

                activityIn, activityOut, dataContentDescription, description, icons.mIsWide,

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

+1 −0
Original line number Diff line number Diff line
@@ -127,6 +127,7 @@ public class NetworkControllerSignalTest extends NetworkControllerBaseTest { 
        for (int testStrength = SignalStrength.SIGNAL_STRENGTH_NONE_OR_UNKNOWN;

                testStrength <= SignalStrength.SIGNAL_STRENGTH_GREAT; testStrength++) {

            setupDefaultSignal();

            setConnectivity(NetworkCapabilities.TRANSPORT_CELLULAR, false, false);

            setGsmRoaming(true);

            setLevel(testStrength);