Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: I214fd47fd23f6b9aa5b2de0e817c8eb32b77d1f7
This commit is contained in:
Automerger Merge Worker
2020-02-12 03:13:39 +00:00
parent 8eeba54266 8795408c51
commit 3948f04347
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
telephony/java/android/telephony/SmsMessage.java
View File

@@ -627,7 +627,7 @@ public class SmsMessage {
destinationAddress, message, statusReportRequested); 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); 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 // TODO: SubmitPdu class is used for SMS-DELIVER also now. Refactor for SubmitPdu and new