summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Taylor <tomtaylor@google.com>2011-06-24 11:19:49 -0700
committerTom Taylor <tomtaylor@google.com>2011-06-24 11:19:49 -0700
commitdca923722b6eb0bb3cd8ca1d4d7b478c2fa4352b (patch)
treebff90c99bfbdacd0b9e7dddf2f66ee898e678df4
parentb8f05c322ed3253eee1d47d36ab56783562e418c (diff)
downloadMms-dca923722b6eb0bb3cd8ca1d4d7b478c2fa4352b.tar.gz
Fix NPE
If parsing a sms fails, it silently fails by internally catching an exception and setting the internal SmsMessage guts to null. Catch that situation. Bug 3236638 Change-Id: I71767bd5f2b2713840e9aa7e72d7073cccb98a75
-rwxr-xr-xsrc/com/android/mms/transaction/SmsReceiverService.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/mms/transaction/SmsReceiverService.java b/src/com/android/mms/transaction/SmsReceiverService.java
index 6cdf2add..31733ab2 100755
--- a/src/com/android/mms/transaction/SmsReceiverService.java
+++ b/src/com/android/mms/transaction/SmsReceiverService.java
@@ -446,7 +446,9 @@ public class SmsReceiverService extends Service {
StringBuilder body = new StringBuilder();
for (int i = 0; i < pduCount; i++) {
sms = msgs[i];
- body.append(sms.getDisplayMessageBody());
+ if (sms.mWrappedSmsMessage != null) {
+ body.append(sms.getDisplayMessageBody());
+ }
}
values.put(Inbox.BODY, replaceFormFeeds(body.toString()));
}