diff options
author | Shishir Agrawal <shishir@google.com> | 2014-12-05 19:25:59 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-12-05 19:25:59 +0000 |
commit | 0b1f606c6e79a3a891a19e88ece48d9852081714 (patch) | |
tree | 4cf5be5482149d615a7c5dea00c948ca9a79e268 /src/com/android/settings/sim | |
parent | 5df6e0302c242b801eee73a513ba04a79f508c2e (diff) | |
parent | dd4443a236730046bb26919272ff7d6db084b5bc (diff) | |
download | packages_apps_Settings-0b1f606c6e79a3a891a19e88ece48d9852081714.zip packages_apps_Settings-0b1f606c6e79a3a891a19e88ece48d9852081714.tar.gz packages_apps_Settings-0b1f606c6e79a3a891a19e88ece48d9852081714.tar.bz2 |
Merge "Settings app - read phone number from TelephonyManager." into lmp-mr1-dev
Diffstat (limited to 'src/com/android/settings/sim')
-rw-r--r-- | src/com/android/settings/sim/SimSettings.java | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/com/android/settings/sim/SimSettings.java b/src/com/android/settings/sim/SimSettings.java index 7c50a83..ccd7ce1 100644 --- a/src/com/android/settings/sim/SimSettings.java +++ b/src/com/android/settings/sim/SimSettings.java @@ -419,7 +419,7 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable } else { sir = mSelectableSubInfos.get(position); holder.title.setText(sir.getDisplayName()); - holder.summary.setText(sir.getNumber()); + holder.summary.setText(getPhoneNumber(sir)); holder.icon.setImageBitmap(sir.createIconBitmap(mContext)); } return rowView; @@ -459,11 +459,11 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable setTitle(String.format(getResources() .getString(R.string.sim_editor_title), (mSlotId + 1))); if (mSubInfoRecord != null) { - if (TextUtils.isEmpty(mSubInfoRecord.getNumber())) { + if (TextUtils.isEmpty(getPhoneNumber(mSubInfoRecord))) { setSummary(mSubInfoRecord.getDisplayName()); } else { setSummary(mSubInfoRecord.getDisplayName() + " - " + - mSubInfoRecord.getNumber()); + getPhoneNumber(mSubInfoRecord)); setEnabled(true); } setIcon(new BitmapDrawable(res, (mSubInfoRecord.createIconBitmap(mContext)))); @@ -518,7 +518,7 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable }); TextView numberView = (TextView)dialogLayout.findViewById(R.id.number); - final String rawNumber = mSubInfoRecord.getNumber(); + final String rawNumber = getPhoneNumber(mSubInfoRecord); if (TextUtils.isEmpty(rawNumber)) { numberView.setText(res.getString(com.android.internal.R.string.unknownName)); } else { @@ -636,6 +636,14 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable } + // Returns the line1Number. Line1number should always be read from TelephonyManager since it can + // be overridden for display purposes. + private String getPhoneNumber(SubscriptionInfo info) { + final TelephonyManager tm = + (TelephonyManager) getActivity().getSystemService(Context.TELEPHONY_SERVICE); + return tm.getLine1NumberForSubscriber(info.getSubscriptionId()); + } + private void log(String s) { Log.d(TAG, s); } |