diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-22 18:37:51 -0400 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-22 18:37:51 -0400 |
| commit | 6c618c68f251e42210f7c2f45d69498352da87e0 (patch) | |
| tree | 3b68945a884eb415e97e8fcd0861e94a89317140 /telephony | |
| parent | 96e0c3156e21bbdb0d94201b08d80379b98c472a (diff) | |
| parent | 72fac6778119e42f39e00f5b7e36b7500893f45c (diff) | |
| download | frameworks_base-6c618c68f251e42210f7c2f45d69498352da87e0.zip frameworks_base-6c618c68f251e42210f7c2f45d69498352da87e0.tar.gz frameworks_base-6c618c68f251e42210f7c2f45d69498352da87e0.tar.bz2 | |
Merge change Ie7105dae into eclair
* changes:
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; } /** |