commit 8795408c5189e089f1673cc5485916ecf5f38a1b
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Feb 12 03:08:39 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Feb 12 03:08:39 2020 +0000
tree 7db5abf9cbf4f8c18e0da033dace2e94d007f105
parent c022a034949cdad6ccf829fa45519f1ab0ecabe5
parent 75214226c613c6f2cb8bcaf9dca8d454df705e39

Merge "Return null for getSubmitPdu() for encoding failure instead of NPE" am: 75214226c6

Change-Id: Ib374f2ecf640ed0064b5033251f49ec2febf8801

telephony/java/android/telephony/SmsMessage.java

diff --git a/telephony/java/android/telephony/SmsMessage.java b/telephony/java/android/telephony/SmsMessage.java
index 952e8fb..c68fecf 100644
--- a/telephony/java/android/telephony/SmsMessage.java
+++ b/telephony/java/android/telephony/SmsMessage.java
@@ -627,7 +627,7 @@
                     destinationAddress, message, statusReportRequested);
         }
 
-        return new SubmitPdu(spb);
+        return spb != null ? new SubmitPdu(spb) : null;
     }
 
     /**
@@ -655,7 +655,7 @@
                     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