PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Settings app - read phone number from TelephonyManager." into lmp-mr1-dev

Browse Source
This commit is contained in:
Shishir Agrawal
2014-12-05 19:25:59 +00:00
committed by Android (Google) Code Review
parent 5df6e0302c dd4443a236
commit 0b1f606c6e
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/deviceinfo/SimStatus.java
View File

@@ -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);