| commit | 71e9a56fc30d66ad6d475fbf26425d791c2befa2 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Mon Dec 04 21:28:42 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Dec 04 21:28:42 2017 +0000 |
| tree | 26add76f11a6fefb954eaae507f5ca77eed7982c | |
| parent | ca1265e26fcfaae53e0f4dd9d3aa0023158305dc [diff] | |
| parent | 9dcd3226c10a864bca9720e68169ac07893cfa32 [diff] |
Merge "Make data RAT icon test pass"
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);