Merge CAF branch 'LA.BR.1.2.1_rb2.12' into caf/cm-12.0. (28614449) · Commits · e / devices / smdk4412 / android_frameworks_opt_telephony

src/java/android/provider/Telephony.java

100644 → 100755

+32 −1

Original line number	Diff line number	Diff line
		@@ -3032,6 +3032,38 @@ public final class Telephony {
		};
		}

		/**
		* @hide
		*/
		public static final class CdmaCallOptions implements BaseColumns {
		/**
		* The content:// style URL for this table
		*/
		public static final Uri CONTENT_URI =
		Uri.parse("content://cdma/calloption");

		/**
		* The default sort order for this table
		*/
		public static final String DEFAULT_SORT_ORDER = "name ASC";

		public static final String NAME = "name";

		public static final String MCC = "mcc";

		public static final String MNC = "mnc";

		public static final String NUMERIC = "numeric";

		public static final String NUMBER = "number";

		public static final String TYPE = "type";

		public static final String CATEGORY = "category";

		public static final String STATE = "state";
		}

		/**
		* Contains phone numbers that are blacklisted
		* for phone and/or message purposes.
		@@ -3042,7 +3074,6 @@ public final class Telephony {
		* The content:// style URL for this table
		*/
		public static final Uri CONTENT_URI =

		Uri.parse("content://blacklist");

		/**

+40 −0

Original line number	Diff line number	Diff line
		@@ -1104,6 +1104,46 @@ public final class SmsManager {
		return ret;
		}

		/**
		* Get the SMSC from Icc card
		*
		* @return SMSC of ICC
		* @hide
		*/
		public String getSmscAddressFromIcc() {
		String ret = null;
		try {
		ISms iccISms = getISmsService();
		if (iccISms != null) {
		ret = iccISms.getSmscAddressFromIccForSubscriber(getSubId());
		}
		} catch (RemoteException ex) {
		//ignore it
		}
		return ret;
		}

		/**
		* Set the SMSC to Icc card
		*
		* @param subId for subId which setSmscAddressToIcc is queried.
		* @param scAddress is the service center address
		* @return true if SMSC is set successfully, false otherwise
		* @hide
		*/
		public boolean setSmscAddressToIcc(String scAddress) {
		boolean ret = false;
		try {
		ISms iccISms = getISmsService();
		if (iccISms != null) {
		ret = iccISms.setSmscAddressToIccForSubscriber(getSubId(), scAddress);
		}
		} catch (RemoteException ex) {
		//ignore it
		}
		return ret;
		}

		// see SmsMessage.getStatusOnIcc

		/** Free space (TS 51.011 10.5.3 / 3GPP2 C.S0023 3.4.27). */

+0 −5

Original line number	Diff line number	Diff line
		@@ -434,12 +434,7 @@ public abstract class Connection {
		public void migrateFrom(Connection c) {
		if (c == null) return;
		mListeners = c.mListeners;
		mAddress = c.getAddress();
		mNumberPresentation = c.getNumberPresentation();
		mDialString = c.getOrigDialString();
		mCnapName = c.getCnapName();
		mCnapNamePresentation = c.getCnapNamePresentation();
		mIsIncoming = c.isIncoming();
		mCreateTime = c.getCreateTime();
		mConnectTime = c.getConnectTime();
		mConnectTimeReal = c.getConnectTimeReal();

+10 −3

Original line number	Diff line number	Diff line
		@@ -276,8 +276,8 @@ public abstract class IccPhoneBookInterfaceManager {
		String newAnr = values.getAsString(IccProvider.STR_NEW_ANRS);
		String[] oldEmailArray = TextUtils.isEmpty(oldEmail) ? null : getStringArray(oldEmail);
		String[] newEmailArray = TextUtils.isEmpty(newEmail) ? null : getStringArray(newEmail);
		String[] oldAnrArray = TextUtils.isEmpty(oldAnr) ? null : getStringArray(oldAnr);
		String[] newAnrArray = TextUtils.isEmpty(newAnr) ? null : getStringArray(newAnr);
		String[] oldAnrArray = TextUtils.isEmpty(oldAnr) ? null : getAnrStringArray(oldAnr);
		String[] newAnrArray = TextUtils.isEmpty(newAnr) ? null : getAnrStringArray(newAnr);
		efid = updateEfForIccType(efid);

		if (DBG)
		@@ -404,6 +404,13 @@ public abstract class IccPhoneBookInterfaceManager {
		}
		}

		private String[] getAnrStringArray(String str) {
		if (str != null) {
		return str.split(":");
		}
		return null;
		}

		private String[] getStringArray(String str) {
		if (str != null) {
		return str.split(",");
		@@ -434,7 +441,7 @@ public abstract class IccPhoneBookInterfaceManager {
		public int getAdnCount() {
		int adnCount = 0;
		if (mAdnCache != null) {
		if (mPhone.getCurrentUiccAppType() == AppType.APPTYPE_USIM) {
		if (mIs3gCard) {
		adnCount = mAdnCache.getUsimAdnCount();
		} else {
		adnCount = mAdnCache.getAdnCount();

+1 −1

Original line number	Diff line number	Diff line
		@@ -503,7 +503,7 @@ public class IccProvider extends ContentProvider {
		for (String anr : anrs) {
		if (DBG) log("Adding anr:" + anr);
		anrString.append(anr);
		anrString.append(",");
		anrString.append(":");
		}
		contact[3] = anrString.toString();
		}