| commit | 9dcd3226c10a864bca9720e68169ac07893cfa32 | [log] [tgz] |
|---|---|---|
| author | Evan Laird <evanlaird@google.com> | Mon Dec 04 14:31:48 2017 -0500 |
| committer | Evan Laird <evanlaird@google.com> | Mon Dec 04 14:35:19 2017 -0500 |
| tree | 615234b5ed4c13fdd57e6af0d3fc49ab1f1f263c | |
| parent | e3def31ec007711865bd0720d6e08cf55342ef9e [diff] |
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
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 5fa6f27..8516278 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 @@ 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 2221469..3b796ca 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 @@ } @Test - @Ignore("Flaky") - //TODO(evanlaird): figure out why this fails public void testAlwaysShowDataRatIcon() { setupDefaultSignal(); when(mMockTm.getDataEnabled(mSubId)).thenReturn(false);