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

Commit baa40b06 authored by Marcos Marado's avatar Marcos Marado Committed by Gerrit Code Review
Browse files

MSIM: Data Usage: use the SIM name if available 

* If there's a name given to that SIM, use it
* If not, fallback to "SIM x" instead of "SIMx", to be
  consistent with the rest of the UI

Change-Id: Ie110a795e4411cc212f2838b7489195fbd7a02c6
parent 85832d43

src/com/android/settings/DataUsageSummary.java

+15 −1
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ import android.os.SystemProperties; 
import android.os.UserHandle;

import android.os.UserManager;

import android.preference.Preference;

import android.telephony.SubInfoRecord;

import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;

import android.text.TextUtils;
@@ -2567,7 +2568,20 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable 
        if (i <= 0) {

            return "";

        } else {

            return getText(R.string.data_usage_tab_slot).toString() + i;

            // i-1 is supposed to be the phoneId

            long[] mSubId = SubscriptionManager.getSubId(i-1);

            if (mSubId.length > 0) {

                SubInfoRecord mSubInfo = null;

                for (int j = 0; j < mSubId.length && mSubInfo == null; j++) {

                    mSubInfo = SubscriptionManager.getSubInfoForSubscriber(mSubId[j]);

                }

                if (mSubInfo != null &&

                        mSubInfo.displayName != null &&

                        mSubInfo.displayName != "") {

                   return mSubInfo.displayName;

                }

            }

            return getText(R.string.data_usage_tab_slot).toString() + " " + i;

        }

    }