commit 241b5f6a60066b90411be9d2f8f92c98b5460205
author android-build-team Robot <android-build-team-robot@google.com> Fri Sep 08 07:37:50 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Fri Sep 08 07:37:50 2017 +0000
tree a175d19a67ecc3126636a1af0fb6efef97687e32
parent 207f916cd61088172619952cb08dfe052ebc417d
parent b12b7030171904c8bbf536b8fb0d2f3d7619f444

release-request-8cd2a23c-f767-488e-8139-390d1636483f-for-git_oc-mr1-release-4323561 snap-temp-L80400000100600189

Change-Id: Ia2d484e72848a150a60c3be6be88f573713a1074

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);