Merge "SystemUI: Display RAT icon in quick setting when data is off"

am: f845bbdfa4 Change-Id: I3285f1f9e63cbf3d0487618b5ff636c7637ef9e4
2017-12-06 16:21:34 +00:00
parent 5f2f65239b f845bbdfa4
commit 592f539419
1 changed files with 1 additions and 1 deletions
--- 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;