diff options
| author | Tom Taylor <tomtaylor@google.com> | 2009-10-22 15:47:06 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-22 15:47:06 -0700 |
| commit | 171ad63488fedbf0176b3d8cef5502007399b4dd (patch) | |
| tree | 2fa431f51510eb528a582ce5a3bc1f1bedcd6e02 | |
| parent | e981c33446a98d5ccc0d73c1a840696d77cf0732 (diff) | |
| parent | 6c618c68f251e42210f7c2f45d69498352da87e0 (diff) | |
| download | frameworks_base-171ad63488fedbf0176b3d8cef5502007399b4dd.zip frameworks_base-171ad63488fedbf0176b3d8cef5502007399b4dd.tar.gz frameworks_base-171ad63488fedbf0176b3d8cef5502007399b4dd.tar.bz2 | |
am 6c618c68: Merge change Ie7105dae into eclair
Merge commit '6c618c68f251e42210f7c2f45d69498352da87e0' into eclair-mr2
* commit '6c618c68f251e42210f7c2f45d69498352da87e0':
Handle bad SIM message
| -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; } /** |