From 934f40aab7d403dd2b5817aa6573c7845e808d01 Mon Sep 17 00:00:00 2001 From: Taesu Lee Date: Mon, 16 Dec 2019 10:40:59 +0900 Subject: [PATCH] Return null for getSubmitPdu() for encoding failure instead of NPE It returns null as API description for null message or null destination instead of NPE. Bug: 111731144 Test: atest SmsMessageTest Change-Id: I1dc8537b6d07a43345c266122a1c77e73e58e7e8 Signed-off-by: Taesu Lee --- telephony/java/android/telephony/SmsMessage.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/telephony/java/android/telephony/SmsMessage.java b/telephony/java/android/telephony/SmsMessage.java index 952e8fb7a79d8..c68fecffc6dc3 100644 --- a/telephony/java/android/telephony/SmsMessage.java +++ b/telephony/java/android/telephony/SmsMessage.java @@ -627,7 +627,7 @@ public class SmsMessage { destinationAddress, message, statusReportRequested); } - return new SubmitPdu(spb); + return spb != null ? new SubmitPdu(spb) : null; } /** @@ -655,7 +655,7 @@ public class SmsMessage { destinationAddress, destinationPort, data, statusReportRequested); } - return new SubmitPdu(spb); + return spb != null ? new SubmitPdu(spb) : null; } // TODO: SubmitPdu class is used for SMS-DELIVER also now. Refactor for SubmitPdu and new