commit 4b82b12a154b2a4f9195ec310da8fd5550ccf432
author Nikola <nikolalukic@google.com> Thu Sep 07 23:41:17 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Sep 07 23:41:17 2017 +0000
tree a175d19a67ecc3126636a1af0fb6efef97687e32
parent 42aa61ff2eb12f4e98ee7b95c0031feff1b6aec8
parent b0b43d95d5b772c3eec7bab98bd002d9f43a8c60

Add messageId null check in persistIfRequired. am: b12b703017
am: b0b43d95d5

Change-Id: I92efd0f1a1fee5ffbcc76ce720c5b8c8471f23f4

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