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/deviceinfo | |
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/deviceinfo')
-rw-r--r-- | src/com/android/settings/deviceinfo/SimStatus.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/com/android/settings/deviceinfo/SimStatus.java b/src/com/android/settings/deviceinfo/SimStatus.java index ce8484d..2d1da40 100644 --- a/src/com/android/settings/deviceinfo/SimStatus.java +++ b/src/com/android/settings/deviceinfo/SimStatus.java @@ -343,7 +343,7 @@ public class SimStatus extends PreferenceActivity { } } - String rawNumber = mPhone.getLine1Number(); // may be null or empty + String rawNumber = mTelephonyManager.getLine1Number(); // may be null or empty String formattedNumber = null; if (!TextUtils.isEmpty(rawNumber)) { formattedNumber = PhoneNumberUtils.formatNumber(rawNumber); @@ -353,9 +353,7 @@ public class SimStatus extends PreferenceActivity { final String imei = mPhone.getPhoneType() == TelephonyManager.PHONE_TYPE_CDMA ? mPhone.getImei() : mPhone.getDeviceId(); setSummaryText(KEY_IMEI, imei); - setSummaryText(KEY_IMEI_SV, - ((TelephonyManager) getSystemService(TELEPHONY_SERVICE)) - .getDeviceSoftwareVersion(/*slotId*/)); + setSummaryText(KEY_IMEI_SV, mTelephonyManager.getDeviceSoftwareVersion(/*slotId*/)); if (!mShowLatestAreaInfo) { removePreferenceFromScreen(KEY_LATEST_AREA_INFO); |