Merge branch 'jb_mr2' of git://codeaurora.org/platform/frameworks/opt/telephony into cm-10.2 (7737a357) · Commits · e / os / android_frameworks_opt_telephony

src/java/android/provider/Telephony.java

+158 −6

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2006 The Android Open Source Project
		* Copyright (c) 2012-2013 The Linux Foundation. All rights reserved.
		*
		* Not a Contribution.
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		@@ -25,11 +28,14 @@ import android.content.Intent;
		import android.database.Cursor;
		import android.database.sqlite.SqliteWrapper;
		import android.net.Uri;
		import android.telephony.MSimSmsManager;
		import android.telephony.SmsMessage;
		import android.text.TextUtils;
		import android.telephony.Rlog;
		import android.util.Patterns;

		import com.android.internal.telephony.MSimConstants;

		import java.util.HashSet;
		import java.util.Set;
		import java.util.regex.Matcher;
		@@ -161,6 +167,12 @@ public final class Telephony {
		*/
		public static final String LOCKED = "locked";

		/**
		* The sub_id to which the message belongs to
		* <p>Type: INTEGER</p>
		*/
		public static final String SUB_ID = "sub_id";

		/**
		* Error code associated with sending or receiving this message
		* <P>Type: INTEGER</P>
		@@ -216,7 +228,29 @@ public final class Telephony {
		Uri uri, String address, String body, String subject,
		Long date, boolean read, boolean deliveryReport) {
		return addMessageToUri(resolver, uri, address, body, subject,
		date, read, deliveryReport, -1L);
		date, read, deliveryReport, -1L,
		MSimSmsManager.getDefault().getPreferredSmsSubscription());
		}

		/**
		* Add an SMS to the given URI.
		*
		* @param resolver the content resolver to use
		* @param uri the URI to add the message to
		* @param address the address of the sender
		* @param body the body of the message
		* @param subject the psuedo-subject of the message
		* @param date the timestamp for the message
		* @param read true if the message has been read, false if not
		* @param deliveryReport true if a delivery report was requested, false if not
		* @param subId the sub_id which the message belongs to
		* @return the URI for the new message
		*/
		public static Uri addMessageToUri(ContentResolver resolver,
		Uri uri, String address, String body, String subject,
		Long date, boolean read, boolean deliveryReport, int subId) {
		return addMessageToUri(resolver, uri, address, body, subject,
		date, read, deliveryReport, -1L, subId);
		}

		/**
		@@ -236,8 +270,33 @@ public final class Telephony {
		public static Uri addMessageToUri(ContentResolver resolver,
		Uri uri, String address, String body, String subject,
		Long date, boolean read, boolean deliveryReport, long threadId) {
		ContentValues values = new ContentValues(7);
		return addMessageToUri(resolver, uri, address, body, subject,
		date, read, deliveryReport, threadId,
		MSimSmsManager.getDefault().getPreferredSmsSubscription());
		}

		/**
		* Add an SMS to the given URI with thread_id specified.
		*
		* @param resolver the content resolver to use
		* @param uri the URI to add the message to
		* @param address the address of the sender
		* @param body the body of the message
		* @param subject the psuedo-subject of the message
		* @param date the timestamp for the message
		* @param read true if the message has been read, false if not
		* @param deliveryReport true if a delivery report was requested, false if not
		* @param threadId the thread_id of the message
		* @param subId the sub_id which the message belongs to
		* @return the URI for the new message
		*/
		public static Uri addMessageToUri(ContentResolver resolver,
		Uri uri, String address, String body, String subject,
		Long date, boolean read, boolean deliveryReport, long threadId, int subId) {
		ContentValues values = new ContentValues(8);
		Rlog.v(TAG,"Telephony addMessageToUri sub id: " + subId);

		values.put(SUB_ID, subId);
		values.put(ADDRESS, address);
		if (date != null) {
		values.put(DATE, date);
		@@ -341,7 +400,27 @@ public final class Telephony {
		String address, String body, String subject, Long date,
		boolean read) {
		return addMessageToUri(resolver, CONTENT_URI, address, body,
		subject, date, read, false);
		subject, date, read, false,
		MSimSmsManager.getDefault().getPreferredSmsSubscription());
		}

		/**
		* Add an SMS to the Draft box.
		*
		* @param resolver the content resolver to use
		* @param address the address of the sender
		* @param body the body of the message
		* @param subject the psuedo-subject of the message
		* @param date the timestamp for the message
		* @param read true if the message has been read, false if not
		* @param subId the sub_id which the message belongs to
		* @return the URI for the new message
		*/
		public static Uri addMessage(ContentResolver resolver,
		String address, String body, String subject, Long date,
		boolean read, int subId) {
		return addMessageToUri(resolver, CONTENT_URI, address, body,
		subject, date, read, false, subId);
		}
		}

		@@ -373,7 +452,25 @@ public final class Telephony {
		public static Uri addMessage(ContentResolver resolver,
		String address, String body, String subject, Long date) {
		return addMessageToUri(resolver, CONTENT_URI, address, body,
		subject, date, true, false);
		subject, date, true, false,
		MSimSmsManager.getDefault().getPreferredSmsSubscription());
		}

		/**
		* Add an SMS to the Draft box.
		*
		* @param resolver the content resolver to use
		* @param address the address of the sender
		* @param body the body of the message
		* @param subject the psuedo-subject of the message
		* @param date the timestamp for the message
		* @param subId the sub_id which the message belongs to
		* @return the URI for the new message
		*/
		public static Uri addMessage(ContentResolver resolver,
		String address, String body, String subject, Long date, int subId) {
		return addMessageToUri(resolver, CONTENT_URI, address, body,
		subject, date, true, false, subId);
		}
		}

		@@ -405,7 +502,25 @@ public final class Telephony {
		public static Uri addMessage(ContentResolver resolver,
		String address, String body, String subject, Long date) {
		return addMessageToUri(resolver, CONTENT_URI, address, body,
		subject, date, true, false);
		subject, date, true, false,
		MSimSmsManager.getDefault().getPreferredSmsSubscription());
		}

		/**
		* Add an SMS to the Draft box.
		*
		* @param resolver the content resolver to use
		* @param address the address of the sender
		* @param body the body of the message
		* @param subject the psuedo-subject of the message
		* @param date the timestamp for the message
		* @param subId the sub_id which the message belongs to
		* @return the URI for the new message
		*/
		public static Uri addMessage(ContentResolver resolver,
		String address, String body, String subject, Long date, int subId) {
		return addMessageToUri(resolver, CONTENT_URI, address, body,
		subject, date, true, false, subId);
		}

		/**
		@@ -454,8 +569,28 @@ public final class Telephony {
		public static Uri addMessage(ContentResolver resolver,
		String address, String body, String subject, Long date,
		boolean deliveryReport, long threadId) {
		return addMessageToUri(resolver, CONTENT_URI, address, body, subject, date,
		true, deliveryReport, threadId,
		MSimSmsManager.getDefault().getPreferredSmsSubscription());
		}

		/**
		* Add an SMS to the Out box.
		*
		* @param resolver the content resolver to use
		* @param address the address of the sender
		* @param body the body of the message
		* @param subject the psuedo-subject of the message
		* @param date the timestamp for the message
		* @param deliveryReport whether a delivery report was requested for the message
		* @param subId the sub_id which the message belongs to
		* @return the URI for the new message
		*/
		public static Uri addMessage(ContentResolver resolver,
		String address, String body, String subject, Long date,
		boolean deliveryReport, long threadId, int subId) {
		return addMessageToUri(resolver, CONTENT_URI, address, body,
		subject, date, true, deliveryReport, threadId);
		subject, date, true, deliveryReport, threadId, subId);
		}
		}

		@@ -706,6 +841,9 @@ public final class Telephony {
		Object[] messages = (Object[]) intent.getSerializableExtra("pdus");
		String format = intent.getStringExtra("format");
		byte[][] pduObjs = new byte[messages.length][];
		int subId = intent.getIntExtra(MSimConstants.SUBSCRIPTION_KEY, 0);

		Rlog.v(TAG, " getMessagesFromIntent sub_id : " + subId);

		for (int i = 0; i < messages.length; i++) {
		pduObjs[i] = (byte[]) messages[i];
		@@ -716,6 +854,7 @@ public final class Telephony {
		for (int i = 0; i < pduCount; i++) {
		pdus[i] = pduObjs[i];
		msgs[i] = SmsMessage.createFromPdu(pdus[i], format);
		msgs[i].setSubId(subId);
		}
		return msgs;
		}
		@@ -1177,6 +1316,12 @@ public final class Telephony {
		*/
		public static final String LOCKED = "locked";

		/**
		* The sub id to which message belongs to
		* <p>Type: INTEGER</p>
		*/
		public static final String SUB_ID = "sub_id";

		/**
		* Meta data used externally.
		* <P>Type: TEXT</P>
		@@ -1852,6 +1997,13 @@ public final class Telephony {
		* gid: 4E, 33, ...
		*/
		public static final String MVNO_MATCH_DATA = "mvno_match_data";

		/**
		* Initial Preferred APN
		* true : initial preferred APN, false : not initial preferred APN.
		* Default is false.
		*/
		public static final String PREFERRED = "preferred";
		}

		/**

src/java/android/telephony/CellBroadcastMessage.java

+25 −0

Original line number	Diff line number	Diff line
		@@ -49,6 +49,31 @@ public class CellBroadcastMessage implements Parcelable {
		private final long mDeliveryTime;
		private boolean mIsRead;

		/**
		* Indicates the subId
		*
		* @hide
		*/
		private int mSubId = 0;

		/**
		* set Subscription information
		*
		* @hide
		*/
		public void setSubId(int subId) {
		mSubId = subId;
		}

		/**
		* get Subscription information
		*
		* @hide
		*/
		public int getSubId() {
		return mSubId;
		}

		public CellBroadcastMessage(SmsCbMessage message) {
		mSmsCbMessage = message;
		mDeliveryTime = System.currentTimeMillis();

src/java/android/telephony/MSimSmsManager.java

0 → 100644

+718 −0

File added.

Preview size limit exceeded, changes collapsed.

src/java/android/telephony/SmsManager.java

+103 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2008 The Android Open Source Project
		* Copyright (c) 2012, The Linux Foundation. All rights reserved.
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		@@ -93,6 +94,60 @@ public final class SmsManager {
		}
		}

		/**
		* Send a text based SMS.
		*
		* @param destinationAddress the address to send the message to
		* @param scAddress is the service center address or null to use
		* the current default SMSC
		* @param text the body of the message to send
		* @param sentIntent if not NULL this <code>PendingIntent</code> is
		* broadcast when the message is successfully sent, or failed.
		* The result code will be <code>Activity.RESULT_OK</code> for success,
		* or one of these errors:<br>
		* <code>RESULT_ERROR_GENERIC_FAILURE</code><br>
		* <code>RESULT_ERROR_RADIO_OFF</code><br>
		* <code>RESULT_ERROR_NULL_PDU</code><br>
		* For <code>RESULT_ERROR_GENERIC_FAILURE</code> the sentIntent may include
		* the extra "errorCode" containing a radio technology specific value,
		* generally only useful for troubleshooting.<br>
		* The per-application based SMS control checks sentIntent. If sentIntent
		* is NULL the caller will be checked against all unknown applications,
		* which cause smaller number of SMS to be sent in checking period.
		* @param deliveryIntent if not NULL this <code>PendingIntent</code> is
		* broadcast when the message is delivered to the recipient. The
		* raw pdu of the status report is in the extended data ("pdu").
		* @param priority Priority level of the message
		*
		* @throws IllegalArgumentException if destinationAddress or text are empty
		* {@hide}
		*/
		public void sendTextMessageWithPriority(
		String destinationAddress, String scAddress, String text,
		PendingIntent sentIntent, PendingIntent deliveryIntent, int priority) {
		if (TextUtils.isEmpty(destinationAddress)) {
		throw new IllegalArgumentException("Invalid destinationAddress");
		}

		if (TextUtils.isEmpty(text)) {
		throw new IllegalArgumentException("Invalid message body");
		}

		if (priority < 0 \|\| priority > 3) {
		throw new IllegalArgumentException("Invalid priority");
		}

		try {
		ISms iccISms = ISms.Stub.asInterface(ServiceManager.getService("isms"));
		if (iccISms != null) {
		iccISms.sendTextWithPriority(destinationAddress, scAddress, text, sentIntent,
		deliveryIntent, priority);
		}
		} catch (RemoteException ex) {
		// ignore it
		}
		}

		/**
		* Divide a message text into several fragments, none bigger than
		* the maximum SMS message size.
		@@ -518,6 +573,54 @@ public final class SmsManager {
		return messages;
		}

		/**
		* SMS over IMS is supported if IMS is registered and SMS is supported
		* on IMS.
		*
		* @return true if SMS over IMS is supported, false otherwise
		*
		* @see #getImsSmsFormat()
		*
		* @hide
		*/
		boolean isImsSmsSupported() {
		boolean boSupported = false;
		try {
		ISms iccISms = ISms.Stub.asInterface(ServiceManager.getService("isms"));
		if (iccISms != null) {
		boSupported = iccISms.isImsSmsSupported();
		}
		} catch (RemoteException ex) {
		// ignore it
		}
		return boSupported;
		}

		/**
		* Gets SMS format supported on IMS. SMS over IMS format is
		* either 3GPP or 3GPP2.
		*
		* @return SmsMessage.FORMAT_3GPP,
		* SmsMessage.FORMAT_3GPP2
		* or SmsMessage.FORMAT_UNKNOWN
		*
		* @see #isImsSmsSupported()
		*
		* @hide
		*/
		String getImsSmsFormat() {
		String format = com.android.internal.telephony.SmsConstants.FORMAT_UNKNOWN;
		try {
		ISms iccISms = ISms.Stub.asInterface(ServiceManager.getService("isms"));
		if (iccISms != null) {
		format = iccISms.getImsSmsFormat();
		}
		} catch (RemoteException ex) {
		// ignore it
		}
		return format;
		}

		// see SmsMessage.getStatusOnIcc

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

src/java/android/telephony/SmsMessage.java

+75 −16

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2008 The Android Open Source Project
		* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.
		*
		* Not a Contribution.
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		@@ -101,6 +104,28 @@ public class SmsMessage {
		*/
		public SmsMessageBase mWrappedSmsMessage;

		/** Indicates the subId
		*
		* @hide
		*/
		private int mSubId = 0;

		/** set Subscription information
		*
		* @hide
		*/
		public void setSubId(int subId) {
		mSubId = subId;
		}

		/** get Subscription information
		*
		* @hide
		*/
		public int getSubId() {
		return mSubId;
		}

		public static class SubmitPdu {

		public byte[] encodedScAddress; // Null if not applicable.
		@@ -137,16 +162,29 @@ public class SmsMessage {
		* into the new method {@code createFromPdu(byte[], String)} which takes an
		* extra format parameter. This is required in order to correctly decode the PDU on
		* devices that require support for both 3GPP and 3GPP2 formats at the same time,
		* such as dual-mode GSM/CDMA and CDMA/LTE phones.
		* such as dual-mode GSM/CDMA and CDMA/LTE phones. Guess format based on Voice
		* technology first, if it fails use other format.
		*/
		public static SmsMessage createFromPdu(byte[] pdu) {
		SmsMessage message = null;

		// cdma(3gpp2) vs gsm(3gpp) format info was not given,
		// guess from active voice phone type
		int activePhone = TelephonyManager.getDefault().getCurrentPhoneType();
		String format = (PHONE_TYPE_CDMA == activePhone) ?
		SmsConstants.FORMAT_3GPP2 : SmsConstants.FORMAT_3GPP;
		if (com.android.internal.telephony.SyntheticSmsMessage.isSyntheticPdu(pdu)) {
		format = FORMAT_SYNTHETIC;
		}
		return createFromPdu(pdu, format);
		message = createFromPdu(pdu, format);

		if (null == message \|\| null == message.mWrappedSmsMessage) {
		// decoding pdu failed based on activePhone type, must be other format
		format = (PHONE_TYPE_CDMA == activePhone) ?
		SmsConstants.FORMAT_3GPP : SmsConstants.FORMAT_3GPP2;
		message = createFromPdu(pdu, format);
		}
		return message;
		}

		/**
		@@ -214,9 +252,8 @@ public class SmsMessage {
		*/
		public static SmsMessage createFromEfRecord(int index, byte[] data) {
		SmsMessageBase wrappedMessage;
		int activePhone = TelephonyManager.getDefault().getCurrentPhoneType();

		if (PHONE_TYPE_CDMA == activePhone) {
		if (isCdmaVoice()) {
		wrappedMessage = com.android.internal.telephony.cdma.SmsMessage.createFromEfRecord(
		index, data);
		} else {
		@@ -235,9 +272,7 @@ public class SmsMessage {
		* We should probably deprecate it and remove the obsolete test case.
		*/
		public static int getTPLayerLengthForPDU(String pdu) {
		int activePhone = TelephonyManager.getDefault().getCurrentPhoneType();

		if (PHONE_TYPE_CDMA == activePhone) {
		if (isCdmaVoice()) {
		return com.android.internal.telephony.cdma.SmsMessage.getTPLayerLengthForPDU(pdu);
		} else {
		return com.android.internal.telephony.gsm.SmsMessage.getTPLayerLengthForPDU(pdu);
		@@ -270,8 +305,8 @@ public class SmsMessage {
		* code unit size (see the ENCODING_* definitions in SmsConstants)
		*/
		public static int[] calculateLength(CharSequence msgBody, boolean use7bitOnly) {
		int activePhone = TelephonyManager.getDefault().getCurrentPhoneType();
		TextEncodingDetails ted = (PHONE_TYPE_CDMA == activePhone) ?
		// this function is for MO SMS
		TextEncodingDetails ted = (useCdmaFormatForMoSms()) ?
		com.android.internal.telephony.cdma.SmsMessage.calculateLength(msgBody, use7bitOnly) :
		com.android.internal.telephony.gsm.SmsMessage.calculateLength(msgBody, use7bitOnly);
		int ret[] = new int[4];
		@@ -293,8 +328,8 @@ public class SmsMessage {
		* @hide
		*/
		public static ArrayList<String> fragmentText(String text) {
		int activePhone = TelephonyManager.getDefault().getCurrentPhoneType();
		TextEncodingDetails ted = (PHONE_TYPE_CDMA == activePhone) ?
		// This function is for MO SMS
		TextEncodingDetails ted = (useCdmaFormatForMoSms()) ?
		com.android.internal.telephony.cdma.SmsMessage.calculateLength(text, false) :
		com.android.internal.telephony.gsm.SmsMessage.calculateLength(text, false);

		@@ -336,7 +371,7 @@ public class SmsMessage {
		while (pos < textLen) {
		int nextPos = 0; // Counts code units.
		if (ted.codeUnitSize == SmsConstants.ENCODING_7BIT) {
		if (activePhone == PHONE_TYPE_CDMA && ted.msgCount == 1) {
		if (useCdmaFormatForMoSms() && ted.msgCount == 1) {
		// For a singleton CDMA message, the encoding must be ASCII...
		nextPos = pos + Math.min(limit, textLen - pos);
		} else {
		@@ -409,9 +444,8 @@ public class SmsMessage {
		public static SubmitPdu getSubmitPdu(String scAddress,
		String destinationAddress, String message, boolean statusReportRequested) {
		SubmitPduBase spb;
		int activePhone = TelephonyManager.getDefault().getCurrentPhoneType();

		if (PHONE_TYPE_CDMA == activePhone) {
		if (useCdmaFormatForMoSms()) {
		spb = com.android.internal.telephony.cdma.SmsMessage.getSubmitPdu(scAddress,
		destinationAddress, message, statusReportRequested, null);
		} else {
		@@ -439,9 +473,8 @@ public class SmsMessage {
		String destinationAddress, short destinationPort, byte[] data,
		boolean statusReportRequested) {
		SubmitPduBase spb;
		int activePhone = TelephonyManager.getDefault().getCurrentPhoneType();

		if (PHONE_TYPE_CDMA == activePhone) {
		if (useCdmaFormatForMoSms()) {
		spb = com.android.internal.telephony.cdma.SmsMessage.getSubmitPdu(scAddress,
		destinationAddress, destinationPort, data, statusReportRequested);
		} else {
		@@ -696,4 +729,30 @@ public class SmsMessage {
		public boolean isReplyPathPresent() {
		return mWrappedSmsMessage.isReplyPathPresent();
		}

		/**
		* Determines whether or not to use CDMA format for MO SMS.
		* If SMS over IMS is supported, then format is based on IMS SMS format,
		* otherwise format is based on current phone type.
		*
		* @return true if Cdma format should be used for MO SMS, false otherwise.
		*/
		private static boolean useCdmaFormatForMoSms() {
		if (!SmsManager.getDefault().isImsSmsSupported()) {
		// use Voice technology to determine SMS format.
		return isCdmaVoice();
		}
		// IMS is registered with SMS support, check the SMS format supported
		return (SmsConstants.FORMAT_3GPP2.equals(SmsManager.getDefault().getImsSmsFormat()));
		}

		/**
		* Determines whether or not to current phone type is cdma.
		*
		* @return true if current phone type is cdma, false otherwise.
		*/
		private static boolean isCdmaVoice() {
		int activePhone = TelephonyManager.getDefault().getCurrentPhoneType();
		return (PHONE_TYPE_CDMA == activePhone);
		}
		}