Merge "Settings app - read phone number from TelephonyManager." into lmp-mr1-dev (0b1f606c) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/deviceinfo/SimStatus.java

+2 −4

Original line number	Diff line number	Diff line
		@@ -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);

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

+12 −4

Original line number	Diff line number	Diff line
		@@ -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);
		}