diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2017-09-25 17:21:22 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-09-25 17:21:22 +0000 |
| commit | 01025cc5cc95337528ab3a8e29bd69f12d8cb25e (patch) | |
| tree | 6017e261237c71caabfc9ee3c17028748038bb82 | |
| parent | 4984c1ded4749d589dbe910e71f87cb182e2ff7a (diff) | |
| parent | fb1cc63706326019b916a3d167e69920c903000b (diff) | |
| download | android_frameworks_opt_telephony-01025cc5cc95337528ab3a8e29bd69f12d8cb25e.tar.gz android_frameworks_opt_telephony-01025cc5cc95337528ab3a8e29bd69f12d8cb25e.tar.bz2 android_frameworks_opt_telephony-01025cc5cc95337528ab3a8e29bd69f12d8cb25e.zip | |
Merge cherrypicks of [2953251] into oc-r3-release
Change-Id: Iec0e067030ca7151363a2f5313aeaef6bc1a27e5
| -rw-r--r-- | src/java/com/android/internal/telephony/AppSmsManager.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/java/com/android/internal/telephony/AppSmsManager.java b/src/java/com/android/internal/telephony/AppSmsManager.java index f2a783ff5..11e7f1023 100644 --- a/src/java/com/android/internal/telephony/AppSmsManager.java +++ b/src/java/com/android/internal/telephony/AppSmsManager.java @@ -129,7 +129,7 @@ public class AppSmsManager { } StringBuilder fullMessageBuilder = new StringBuilder(); for (SmsMessage message : messages) { - if (message.getMessageBody() == null) { + if (message == null || message.getMessageBody() == null) { continue; } fullMessageBuilder.append(message.getMessageBody()); |