Merge "Cleanup code and documentation for SMS EF records" am: e27d58f0cd am: 443c2e678c (952b58ef) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/SmsManager.java

+5 −7

Original line number	Diff line number	Diff line
		@@ -1622,7 +1622,7 @@ public final class SmsManager {
		}

		/**
		* Delete the specified message from the ICC.
		* Deletes the specified message from the ICC.
		* ICC (Integrated Circuit Card) is the card of the device.
		* For example, this can be the SIM or USIM for GSM.
		*
		@@ -1706,7 +1706,7 @@ public final class SmsManager {
		}

		/**
		* Retrieves all messages currently stored on ICC.
		* Retrieves all messages currently stored on the ICC.
		* ICC (Integrated Circuit Card) is the card of the device.
		* For example, this can be the SIM or USIM for GSM.
		*
		@@ -1872,8 +1872,7 @@ public final class SmsManager {
		}

		/**
		* Create a list of <code>SmsMessage</code>s from a list of RawSmsData
		* records returned by <code>getAllMessagesFromIcc()</code>
		* Creates a list of <code>SmsMessage</code>s from a list of SmsRawData records.
		*
		* <p class="note"><strong>Note:</strong> This method is intended for internal use by carrier
		* applications or the Telephony framework and will never trigger an SMS disambiguation
		@@ -1885,8 +1884,7 @@ public final class SmsManager {
		* operation is performed on the correct subscription.
		* </p>
		*
		* @param records SMS EF records, returned by
		* <code>getAllMessagesFromIcc</code>
		* @param records SMS EF records.
		* @return <code>ArrayList</code> of <code>SmsMessage</code> objects.
		*/
		private ArrayList<SmsMessage> createMessageListFromRawRecords(List<SmsRawData> records) {

+6 −23

Original line number	Diff line number	Diff line
		@@ -278,41 +278,24 @@ public class SmsMessage {
		}

		/**
		* Create an SmsMessage from an SMS EF record.
		* Creates an SmsMessage from an SMS EF record.
		*
		* @param index Index of SMS record. This should be index in ArrayList
		* returned by SmsManager.getAllMessagesFromSim + 1.
		* @param index Index of SMS EF record.
		* @param data Record data.
		* @return An SmsMessage representing the record.
		*
		* @hide
		*/
		public static SmsMessage createFromEfRecord(int index, byte[] data) {
		SmsMessageBase wrappedMessage;

		if (isCdmaVoice()) {
		wrappedMessage = com.android.internal.telephony.cdma.SmsMessage.createFromEfRecord(
		index, data);
		} else {
		wrappedMessage = com.android.internal.telephony.gsm.SmsMessage.createFromEfRecord(
		index, data);
		}

		if (wrappedMessage != null) {
		return new SmsMessage(wrappedMessage);
		} else {
		Rlog.e(LOG_TAG, "createFromEfRecord(): wrappedMessage is null");
		return null;
		}
		return createFromEfRecord(index, data, SmsManager.getDefaultSmsSubscriptionId());
		}

		/**
		* Create an SmsMessage from an SMS EF record.
		* Creates an SmsMessage from an SMS EF record.
		*
		* @param index Index of SMS record. This should be index in ArrayList
		* returned by SmsManager.getAllMessagesFromSim + 1.
		* @param index Index of SMS EF record.
		* @param data Record data.
		* @param subId Subscription Id of the SMS
		* @param subId Subscription Id associated with the record.
		* @return An SmsMessage representing the record.
		*
		* @hide

+2 −3

Original line number	Diff line number	Diff line
		@@ -148,10 +148,9 @@ public class SmsMessage extends SmsMessageBase {
		}

		/**
		* Create an SmsMessage from an SMS EF record.
		* Creates an SmsMessage from an SMS EF record.
		*
		* @param index Index of SMS record. This should be index in ArrayList
		* returned by RuimSmsInterfaceManager.getAllMessagesFromIcc + 1.
		* @param index Index of SMS EF record.
		* @param data Record data.
		* @return An SmsMessage representing the record.
		*

+2 −3

Original line number	Diff line number	Diff line
		@@ -168,10 +168,9 @@ public class SmsMessage extends SmsMessageBase {
		}

		/**
		* Create an SmsMessage from an SMS EF record.
		* Creates an SmsMessage from an SMS EF record.
		*
		* @param index Index of SMS record. This should be index in ArrayList
		* returned by SmsManager.getAllMessagesFromSim + 1.
		* @param index Index of SMS EF record.
		* @param data Record data.
		* @return An SmsMessage representing the record.
		*