Only discard the roaming icon if we're not roaming anymore.

  Ignore data roaming toggle because it shouldn't have impact on whether
  we show the indicator or not.

Change-Id: I445c1005a935eaca9d0a132d5a5a7fd214b300d0
(cherry picked from commit 682198e)

packages/SystemUI/src/com/android/systemui/statusbar/policy/MSimNetworkController.java

@@ -663,11 +663,6 @@ private final void updateDataNetType(int subscription) {
         // DSDS case: Data is active only on DDS. Clear the icon for NON-DDS
         int dataSub = MSimTelephonyManager.getDefault().getPreferredDataSubscription();
 
-        // Clear roaming if we're always showing an indicator
-        if (SystemProperties.getBoolean("ro.config.always_show_roaming", false)) {
-            mMSimDataRoamIconId[subscription] = 0;
-        }
-
         if (subscription != dataSub) {
             if (DEBUG) {
                 Slog.d(TAG,"updateDataNetType: SUB" + subscription
@@ -845,6 +840,8 @@ private final void updateDataNetType(int subscription) {
             }
             if (subscription == dataSub) mQSDataTypeIconId =
                     TelephonyIcons.QS_DATA_R[mInetCondition];
+        } else if (!mPhone.isNetworkRoaming(subscription)) {
+            mMSimDataRoamIconId[subscription] = 0;
         }
     }
 
@@ -1058,11 +1055,6 @@ protected void refreshViews(int subscription) {
         final boolean emergencyOnly = isEmergencyOnly(); // All sims are emergency only
         int dataSub = MSimTelephonyManager.getDefault().getPreferredDataSubscription();
 
-        // Clear roaming if we're always showing an indicator
-        if (SystemProperties.getBoolean("ro.config.always_show_roaming", false)) {
-            mMSimDataRoamIconId[subscription] = 0;
-        }
-
         if (DEBUG) {
             Slog.d(TAG,"refreshViews subscription =" + subscription + "mMSimDataConnected ="
                     + mMSimDataConnected[subscription]);
@@ -1243,6 +1235,8 @@ else if (!mMSimDataConnected[subscription] && !mWifiConnected && !mBluetoothTeth
                 }
                 if (subscription == dataSub) mQSDataTypeIconId =
                         TelephonyIcons.QS_DATA_R[mInetCondition];
+            } else if (!mPhone.isNetworkRoaming(subscription)) {
+                    mMSimDataRoamIconId[subscription] = 0;
             }
         }