Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Cleanup code and documentation for SMS EF records"

Browse Source 
am: e27d58f0cd

Change-Id: I123472b4c8cd8fb89d7df1fecc152d571466f95e
This commit is contained in:
Taesu Lee
2020-01-22 09:13:26 -08:00
committed by android-build-merger
parent fd50fcf588 e27d58f0cd
commit 443c2e678c
4 changed files with 15 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
telephony/java/android/telephony/SmsManager.java
View File

@@ -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. * ICC (Integrated Circuit Card) is the card of the device.
* For example, this can be the SIM or USIM for GSM. * 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. * ICC (Integrated Circuit Card) is the card of the device.
* For example, this can be the SIM or USIM for GSM. * 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 * Creates a list of <code>SmsMessage</code>s from a list of SmsRawData records.
* records returned by <code>getAllMessagesFromIcc()</code>
* *
* <p class="note"><strong>Note:</strong> This method is intended for internal use by carrier * <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 * 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. * operation is performed on the correct subscription.
* </p> * </p>
* *
* @param records SMS EF records, returned by * @param records SMS EF records.
* <code>getAllMessagesFromIcc</code>
* @return <code>ArrayList</code> of <code>SmsMessage</code> objects. * @return <code>ArrayList</code> of <code>SmsMessage</code> objects.
*/ */
private ArrayList<SmsMessage> createMessageListFromRawRecords(List<SmsRawData> records) { private ArrayList<SmsMessage> createMessageListFromRawRecords(List<SmsRawData> records) {

29
telephony/java/android/telephony/SmsMessage.java
View File

@@ -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 * @param index Index of SMS EF record.
* returned by SmsManager.getAllMessagesFromSim + 1.
* @param data Record data. * @param data Record data.
* @return An SmsMessage representing the record. * @return An SmsMessage representing the record.
* *
* @hide * @hide
*/ */
public static SmsMessage createFromEfRecord(int index, byte[] data) { public static SmsMessage createFromEfRecord(int index, byte[] data) {
SmsMessageBase wrappedMessage; return createFromEfRecord(index, data, SmsManager.getDefaultSmsSubscriptionId());
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;
}
} }
/** /**
* 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 * @param index Index of SMS EF record.
* returned by SmsManager.getAllMessagesFromSim + 1.
* @param data Record data. * @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. * @return An SmsMessage representing the record.
* *
* @hide * @hide

5
telephony/java/com/android/internal/telephony/cdma/SmsMessage.java
View File

@@ -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 * @param index Index of SMS EF record.
* returned by RuimSmsInterfaceManager.getAllMessagesFromIcc + 1.
* @param data Record data. * @param data Record data.
* @return An SmsMessage representing the record. * @return An SmsMessage representing the record.
* *

5
telephony/java/com/android/internal/telephony/gsm/SmsMessage.java
View File

@@ -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 * @param index Index of SMS EF record.
* returned by SmsManager.getAllMessagesFromSim + 1.
* @param data Record data. * @param data Record data.
* @return An SmsMessage representing the record. * @return An SmsMessage representing the record.
* *