commit 130a76c806469b5b814b1d647713dd0cdec1fe9f
author Sanket Padawe <sanketpadawe@google.com> Thu Feb 26 23:18:55 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Feb 26 23:18:55 2015 +0000
tree a192b39ce2d7af01d660409813627f5f2ea42e2a
parent 0209af6bc7979ef11011d8cce162c437ca472126
parent 49d660ac014c3802aa5e694d745b284fc2b601ae

am 49d660ac: am 4e838ca9: Merge "Use TelephonyManager api to get SPN of sim to display in UI." into lmp-mr1-dev

* commit '49d660ac014c3802aa5e694d745b284fc2b601ae':
  Use TelephonyManager api to get SPN of sim to display in UI.

src/com/android/settings/sim/SimSettings.java

diff --git a/src/com/android/settings/sim/SimSettings.java b/src/com/android/settings/sim/SimSettings.java
index 92a10d6..5d963ed 100644
--- a/src/com/android/settings/sim/SimSettings.java
+++ b/src/com/android/settings/sim/SimSettings.java
@@ -365,8 +365,14 @@
                 numberView.setText(PhoneNumberUtils.formatNumber(rawNumber));
             }
 
+            final TelephonyManager tm =
+                        (TelephonyManager) getActivity().getSystemService(
+                        Context.TELEPHONY_SERVICE);
+            String simCarrierName = tm.getSimOperatorNameForSubscription(mSubInfoRecord
+                        .getSubscriptionId());
             TextView carrierView = (TextView)dialogLayout.findViewById(R.id.carrier);
-            carrierView.setText(mSubInfoRecord.getCarrierName());
+            carrierView.setText(!TextUtils.isEmpty(simCarrierName) ? simCarrierName :
+                    getContext().getString(com.android.internal.R.string.unknownName));
 
             builder.setTitle(String.format(res.getString(R.string.sim_editor_title),
                     (mSubInfoRecord.getSimSlotIndex() + 1)));