commit 82d205d53d99ae2801f156c1124f5162603daf21
author Xin Li <delphij@google.com> Wed Dec 06 11:52:12 2017 -0800
committer Xin Li <delphij@google.com> Wed Dec 06 14:24:55 2017 -0800
tree a175d19a67ecc3126636a1af0fb6efef97687e32
parent 0285e3a1c1322682bc6f45042f6aba5376dd14a8
parent b0b43d95d5b772c3eec7bab98bd002d9f43a8c60

DO NOT MERGE: Merge Oreo MR1 into master

Exempt-From-Owner-Approval: Changes already landed internally
Change-Id: I34d1ffa271e7aa97f5e3e666c457932108e5c3e8

src/com/android/mms/service/SendRequest.java

diff --git a/src/com/android/mms/service/SendRequest.java b/src/com/android/mms/service/SendRequest.java
index 21cd43c..a130dfe 100644
--- a/src/com/android/mms/service/SendRequest.java
+++ b/src/com/android/mms/service/SendRequest.java
@@ -205,8 +205,10 @@
             }
             if (sendConf != null) {
                 values.put(Telephony.Mms.RESPONSE_STATUS, sendConf.getResponseStatus());
-                values.put(Telephony.Mms.MESSAGE_ID,
-                        PduPersister.toIsoString(sendConf.getMessageId()));
+                byte[] messageId = sendConf.getMessageId();
+                if (messageId != null) {
+                    values.put(Telephony.Mms.MESSAGE_ID, PduPersister.toIsoString(messageId));
+                }
             }
             values.put(Telephony.Mms.DATE, System.currentTimeMillis() / 1000L);
             values.put(Telephony.Mms.READ, 1);