From 0b90863da9fa03fb3dc6c6e03190f0fc14587f2f Mon Sep 17 00:00:00 2001
From: Evan Laird <evanlaird@google.com>
Date: Fri, 27 Aug 2021 16:00:58 -0400
Subject: [PATCH] Remove qsDataType since it was the same as dataType

This resolves a TODO and removes unused fields

Test: atest SystemUITests
Bug: 197851948
Change-Id: I5e2eb4896966516f34980863e18b99368f395b20
Merged-In: I5e2eb4896966516f34980863e18b99368f395b20
---
 .../SettingsLib/src/com/android/settingslib/SignalIcon.java | 2 --
 .../systemui/statusbar/policy/MobileSignalController.java   | 6 +++---
 .../systemui/statusbar/policy/WifiSignalController.java     | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/packages/SettingsLib/src/com/android/settingslib/SignalIcon.java b/packages/SettingsLib/src/com/android/settingslib/SignalIcon.java
index aba06056dd34d..85130031e07b6 100644
--- a/packages/SettingsLib/src/com/android/settingslib/SignalIcon.java
+++ b/packages/SettingsLib/src/com/android/settingslib/SignalIcon.java
@@ -139,7 +139,6 @@ public class SignalIcon {
     public static class MobileIconGroup extends IconGroup {
         public final int dataContentDescription; // mContentDescriptionDataType
         public final int dataType;
-        public final int qsDataType;
 
         public MobileIconGroup(String name, int[][] sbIcons, int[][] qsIcons, int[] contentDesc,
                 int sbNullState, int qsNullState, int sbDiscState, int qsDiscState,
@@ -148,7 +147,6 @@ public class SignalIcon {
                 qsDiscState, discContentDesc);
             this.dataContentDescription = dataContentDesc;
             this.dataType = dataType;
-            this.qsDataType = dataType; // TODO: remove this field
         }
     }
 
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 675bbc4d1acf0..5008962ec77d7 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java
@@ -399,7 +399,7 @@ public class MobileSignalController extends SignalController<MobileState, Mobile
             // Only send data sim callbacks to QS.
             if (mCurrentState.dataSim && mCurrentState.isDefault) {
                 qsTypeIcon =
-                        (showDataIcon || mConfig.alwaysShowDataRatIcon) ? icons.qsDataType : 0;
+                        (showDataIcon || mConfig.alwaysShowDataRatIcon) ? icons.dataType : 0;
                 qsIcon = new IconState(mCurrentState.enabled
                         && !mCurrentState.isEmergency, getQsCurrentIconId(), contentDescription);
                 description = mCurrentState.isEmergency ? null : mCurrentState.networkName;
@@ -435,7 +435,7 @@ public class MobileSignalController extends SignalController<MobileState, Mobile
             if (mProviderModelSetting) {
                 if (mCurrentState.dataSim && mCurrentState.isDefault) {
                     qsTypeIcon =
-                            (showDataIcon || mConfig.alwaysShowDataRatIcon) ? icons.qsDataType : 0;
+                            (showDataIcon || mConfig.alwaysShowDataRatIcon) ? icons.dataType : 0;
                     qsIcon = new IconState(
                             mCurrentState.enabled && !mCurrentState.isEmergency,
                             getQsCurrentIconId(), contentDescription);
@@ -444,7 +444,7 @@ public class MobileSignalController extends SignalController<MobileState, Mobile
             } else {
                 if (mCurrentState.dataSim) {
                     qsTypeIcon =
-                            (showDataIcon || mConfig.alwaysShowDataRatIcon) ? icons.qsDataType : 0;
+                            (showDataIcon || mConfig.alwaysShowDataRatIcon) ? icons.dataType : 0;
                     qsIcon = new IconState(
                             mCurrentState.enabled && !mCurrentState.isEmergency,
                             getQsCurrentIconId(), contentDescription);
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/WifiSignalController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/WifiSignalController.java
index 22dff7a266dbc..3f7ddc6c15389 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/WifiSignalController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/WifiSignalController.java
@@ -163,7 +163,7 @@ public class WifiSignalController extends
         int qsTypeIcon = 0;
         IconState qsIcon = null;
         if (sbVisible) {
-            qsTypeIcon = icons.qsDataType;
+            qsTypeIcon = icons.dataType;
             qsIcon = new IconState(mCurrentState.connected, getQsCurrentIconIdForCarrierWifi(),
                     contentDescription);
         }