Merge "Return null for getSubmitPdu() for encoding failure instead of NPE" am:... (ef00c0b6) · Commits · e / os / android_frameworks_base

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