Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3948f043 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

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

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

Change-Id: I214fd47fd23f6b9aa5b2de0e817c8eb32b77d1f7
parents 8eeba542 8795408c

telephony/java/android/telephony/SmsMessage.java

+2 −2
Original line number Diff line number Diff line
@@ -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