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

am 171ad634: am 6c618c68: Merge change Ie7105dae into eclair

Browse Source 
Merge commit '171ad63488fedbf0176b3d8cef5502007399b4dd' into eclair-mr2-plus-aosp

* commit '171ad63488fedbf0176b3d8cef5502007399b4dd':
  Handle bad SIM message
This commit is contained in:
Tom Taylor
2009-10-22 15:57:49 -07:00
committed by Android Git Automerger
parent 7453da3f42 171ad63488
commit bee4b10af2
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -360,7 +360,9 @@ public final class SmsManager {
// List contains all records, including "free" records (null) // List contains all records, including "free" records (null)
if (data != null) { if (data != null) {
SmsMessage sms = SmsMessage.createFromEfRecord(i+1, data.getBytes()); SmsMessage sms = SmsMessage.createFromEfRecord(i+1, data.getBytes());
messages.add(sms); if (sms != null) {
messages.add(sms);
}
} }
} }
} }

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

@@ -218,7 +218,7 @@ public class SmsMessage {
index, data); index, data);
} }
return new SmsMessage(wrappedMessage); return wrappedMessage != null ? new SmsMessage(wrappedMessage) : null;
} }
/** /**