commit 5311dbe8a4d9ea6fa33913fb423a70c5067898c5
author Nancy Chen <nancychen@google.com> Tue May 12 17:30:20 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 12 17:30:26 2015 +0000
tree f461fd5f3fe79d4b1ca423ef8cf70f8098ae589e
parent 4e1f02f6a7536b2c415d907582abe523234ab57b
parent 960e7c97c77e404a46c4e165b37f8c2ddad9685c

Merge "Fix crash when mWrappedMessageData is null." into mnc-dev

src/com/android/phone/vvm/omtp/sms/OmtpMessageReceiver.java

diff --git a/src/com/android/phone/vvm/omtp/sms/OmtpMessageReceiver.java b/src/com/android/phone/vvm/omtp/sms/OmtpMessageReceiver.java
index b9cb4ff..7e6d645 100644
--- a/src/com/android/phone/vvm/omtp/sms/OmtpMessageReceiver.java
+++ b/src/com/android/phone/vvm/omtp/sms/OmtpMessageReceiver.java
@@ -53,7 +53,9 @@
         StringBuilder messageBody = new StringBuilder();
 
         for (int i = 0; i < messages.length; i++) {
-            messageBody.append(messages[i].getMessageBody());
+            if (messages[i].mWrappedSmsMessage != null) {
+                messageBody.append(messages[i].getMessageBody());
+            }
         }
 
         WrappedMessageData messageData = OmtpSmsParser.parse(messageBody.toString());