commit a330b1a093869194203bf4d40ea81676c7f6dbb3
author Sanket Padawe <sanketpadawe@google.com> Thu Feb 26 23:43:07 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Feb 26 23:43:07 2015 +0000
tree b113facb4e9b4a06350c54bf178a45918db0bd82
parent a25ba2aca98ccf9d2994422f5da1246a23065265
parent 85b04c19ed81e74709d74d2acffd4bd42a3b07de

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

* commit '85b04c19ed81e74709d74d2acffd4bd42a3b07de':
  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 eaf932f..3ebc250 100644
--- a/src/com/android/settings/sim/SimSettings.java
+++ b/src/com/android/settings/sim/SimSettings.java
@@ -368,8 +368,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)));