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

am fca752b9: am 70f74b79: Assemble WAP datagram correctly when segments arrive out of order

Browse Source 
Merge commit 'fca752b9d8306c53afb4d362dbcd0921d16baec1'

* commit 'fca752b9d8306c53afb4d362dbcd0921d16baec1':
  Assemble WAP datagram correctly when segments arrive out of order
This commit is contained in:
Christian Gustafsson
2009-09-17 06:37:02 -07:00
committed by Android Git Automerger
parent cde38b4bc4 fca752b9d8
commit bbc8064e62
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
telephony/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java
View File

@@ -299,14 +299,16 @@ final class CdmaSMSDispatcher extends SMSDispatcher {
// Build up the data stream
ByteArrayOutputStream output = new ByteArrayOutputStream();
for (int i = 0; i < totalSegments-1; i++) {
for (int i = 0; i < totalSegments; i++) {
// reassemble the (WSP-)pdu
output.write(pdus[i], 0, pdus[i].length);
if (i == segment) {
// This one isn't in the DB, so add it
output.write(pdu, index, pdu.length - index);
} else {
output.write(pdus[i], 0, pdus[i].length);
}
}
// This one isn't in the DB, so add it
output.write(pdu, index, pdu.length - index);
byte[] datagram = output.toByteArray();
// Dispatch the PDU to applications
switch (destinationPort) {