diff options
| author | Tom Taylor <tomtaylor@google.com> | 2009-10-22 19:05:35 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-22 19:05:35 -0700 |
| commit | 65d15c8e861bfd02348462aba4ff92b257dbb33a (patch) | |
| tree | 2af49c500847bd1ed3c53de9a60f791c2f22b314 /telephony | |
| parent | 4d5d6c0f3fbe3e7fe584caf7a0e7eed4150027e4 (diff) | |
| parent | bee4b10af2e772b2e5c7289b26286a5a33a300ae (diff) | |
| download | frameworks_base-65d15c8e861bfd02348462aba4ff92b257dbb33a.zip frameworks_base-65d15c8e861bfd02348462aba4ff92b257dbb33a.tar.gz frameworks_base-65d15c8e861bfd02348462aba4ff92b257dbb33a.tar.bz2 | |
am bee4b10a: am 171ad634: am 6c618c68: Merge change Ie7105dae into eclair
Merge commit 'bee4b10af2e772b2e5c7289b26286a5a33a300ae'
* commit 'bee4b10af2e772b2e5c7289b26286a5a33a300ae':
Handle bad SIM message
Diffstat (limited to 'telephony')
| -rw-r--r-- | telephony/java/android/telephony/SmsManager.java | 4 | ||||
| -rw-r--r-- | telephony/java/android/telephony/SmsMessage.java | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/telephony/java/android/telephony/SmsManager.java b/telephony/java/android/telephony/SmsManager.java index 80de074..3122722 100644 --- a/telephony/java/android/telephony/SmsManager.java +++ b/telephony/java/android/telephony/SmsManager.java @@ -360,7 +360,9 @@ public final class SmsManager { // List contains all records, including "free" records (null) if (data != null) { SmsMessage sms = SmsMessage.createFromEfRecord(i+1, data.getBytes()); - messages.add(sms); + if (sms != null) { + messages.add(sms); + } } } } diff --git a/telephony/java/android/telephony/SmsMessage.java b/telephony/java/android/telephony/SmsMessage.java index 7a10512..b8ea4c0 100644 --- a/telephony/java/android/telephony/SmsMessage.java +++ b/telephony/java/android/telephony/SmsMessage.java @@ -218,7 +218,7 @@ public class SmsMessage { index, data); } - return new SmsMessage(wrappedMessage); + return wrappedMessage != null ? new SmsMessage(wrappedMessage) : null; } /** |