From 9dcd3226c10a864bca9720e68169ac07893cfa32 Mon Sep 17 00:00:00 2001 From: Evan Laird Date: Mon, 4 Dec 2017 14:31:48 -0500 Subject: [PATCH] Make data RAT icon test pass Change merged in from aosp (I0428ba1749bdb884d210f1ff02cdf86b376a0ca8) had a test written that was failing because the CL only updated the status bar icon, not qs icon. This is my attempt to make the code work as it seemed to be intended. Test: runtest -x \ packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerDataTest.java \ -m testAlwaysShowDataRatIcon Change-Id: I4fe11c2e866cbb1f7784e4ed109671a957ffdf36 --- .../systemui/statusbar/policy/MobileSignalController.java | 2 +- .../systemui/statusbar/policy/NetworkControllerDataTest.java | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java index 5fa6f27f4f615..8516278a8891e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java @@ -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; diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerDataTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerDataTest.java index 22214695ab97c..3b796caa98df1 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerDataTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerDataTest.java @@ -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);