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" am: e27d58f0cd am: 443c2e678c am: 952b58ef7f

Browse Source 
Change-Id: I815802532da085d88336a602e1578c715c543f33
This commit is contained in:
Automerger Merge Worker
2020-01-22 17:26:26 +00:00
parent fd08797501 952b58ef7f
commit b534eb7c60
4 changed files with 15 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1703,7 +1703,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.
*
@@ -1787,7 +1787,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.
*
@@ -1953,8 +1953,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
@@ -1966,8 +1965,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) {
@@ -1978,7 +1976,7 @@ public final class SmsManager {
SmsRawData data = records.get(i);
// List contains all records, including "free" records (null)
if (data != null) {
SmsMessage sms = SmsMessage.createFromEfRecord(i+1, data.getBytes(),
SmsMessage sms = SmsMessage.createFromEfRecord(i + 1, data.getBytes(),
getSubscriptionId());
if (sms != null) {
messages.add(sms);

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
* 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

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

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

@@ -167,10 +167,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.
*