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

Commit 71e9a56f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Make data RAT icon test pass"

parents ca1265e2 9dcd3226

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

+1 −1
Original line number Diff line number Diff line
@@ -288,7 +288,7 @@ public class MobileSignalController extends SignalController< 
        String description = null;

        // Only send data sim callbacks to QS.

        if (mCurrentState.dataSim) {

            qsTypeIcon = showDataIcon ? icons.mQsDataType : 0;

            qsTypeIcon = (showDataIcon || mConfig.alwaysShowDataRatIcon) ? icons.mQsDataType : 0;

            qsIcon = new IconState(mCurrentState.enabled

                    && !mCurrentState.isEmergency, getQsCurrentIconId(), contentDescription);

            description = mCurrentState.isEmergency ? null : mCurrentState.networkName;

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

+0 −2
Original line number Diff line number Diff line
@@ -138,8 +138,6 @@ public class NetworkControllerDataTest extends NetworkControllerBaseTest { 
    }



    @Test

    @Ignore("Flaky")

    //TODO(evanlaird): figure out why this fails

    public void testAlwaysShowDataRatIcon() {

        setupDefaultSignal();

        when(mMockTm.getDataEnabled(mSubId)).thenReturn(false);