diff options
| author | Nikola <nikolalukic@google.com> | 2017-09-06 18:45:24 -0700 |
|---|---|---|
| committer | Nikola <nikolalukic@google.com> | 2017-09-07 10:46:44 -0700 |
| commit | b12b7030171904c8bbf536b8fb0d2f3d7619f444 (patch) | |
| tree | a175d19a67ecc3126636a1af0fb6efef97687e32 | |
| parent | 42aa61ff2eb12f4e98ee7b95c0031feff1b6aec8 (diff) | |
| download | Mms-b12b7030171904c8bbf536b8fb0d2f3d7619f444.tar.gz | |
Add messageId null check in persistIfRequired.oreo-mr1-dev
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
| -rw-r--r-- | src/com/android/mms/service/SendRequest.java | 6 |
1 files 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); |