Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9bb2da13 authored by Adnan's avatar Adnan Committed by Brint E. Kriebel
Browse files

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 682198e3)
parent 15e59e74

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

+4 −10
Original line number Diff line number Diff line
@@ -663,11 +663,6 @@ public class MSimNetworkController extends NetworkController { 
        // 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 @@ public class MSimNetworkController extends NetworkController { 
            }

            if (subscription == dataSub) mQSDataTypeIconId =

                    TelephonyIcons.QS_DATA_R[mInetCondition];

        } else if (!mPhone.isNetworkRoaming(subscription)) {

            mMSimDataRoamIconId[subscription] = 0;

        }

    }
@@ -1058,11 +1055,6 @@ public class MSimNetworkController extends NetworkController { 
        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 @@ public class MSimNetworkController extends NetworkController { 
                }

                if (subscription == dataSub) mQSDataTypeIconId =

                        TelephonyIcons.QS_DATA_R[mInetCondition];

            } else if (!mPhone.isNetworkRoaming(subscription)) {

                    mMSimDataRoamIconId[subscription] = 0;

            }

        }