From b12b7030171904c8bbf536b8fb0d2f3d7619f444 Mon Sep 17 00:00:00 2001 From: Nikola Date: Wed, 6 Sep 2017 18:45:24 -0700 Subject: Add messageId null check in persistIfRequired. Bug: 65421518 Test: Build Android with change and verify that SendRequest does not crash when a pdu confirmation is received from the carrier after sending an MMS from non-default messaging app. Change-Id: Ibf141e4674b528f9c4811df6e04abac16296d108 --- src/com/android/mms/service/SendRequest.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 @@ public class SendRequest extends MmsRequest { } 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); -- cgit v1.2.3