From c692ce761b445465386d921362608b2420daf765 Mon Sep 17 00:00:00 2001 From: Taesu Lee Date: Fri, 1 Feb 2019 18:45:11 +0900 Subject: Avoid NPE caused by null encodedBearerData in privateGetSubmitPdu Just return without HexDump to avoid NPE. Test: Manual Change-Id: Ide705518be4e9d6391ae0b844d681ac9a1a97233 Signed-off-by: Taesu Lee --- telephony/java/com/android/internal/telephony/cdma/SmsMessage.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/telephony/java/com/android/internal/telephony/cdma/SmsMessage.java b/telephony/java/com/android/internal/telephony/cdma/SmsMessage.java index 964a31304db5..bf3b3c95521a 100644 --- a/telephony/java/com/android/internal/telephony/cdma/SmsMessage.java +++ b/telephony/java/com/android/internal/telephony/cdma/SmsMessage.java @@ -858,11 +858,11 @@ public class SmsMessage extends SmsMessageBase { bearerData.userData = userData; byte[] encodedBearerData = BearerData.encode(bearerData); + if (encodedBearerData == null) return null; if (Rlog.isLoggable(LOGGABLE_TAG, Log.VERBOSE)) { Rlog.d(LOG_TAG, "MO (encoded) BearerData = " + bearerData); Rlog.d(LOG_TAG, "MO raw BearerData = '" + HexDump.toHexString(encodedBearerData) + "'"); } - if (encodedBearerData == null) return null; int teleservice = bearerData.hasUserDataHeader ? SmsEnvelope.TELESERVICE_WEMT : SmsEnvelope.TELESERVICE_WMT; -- cgit v1.2.3-59-g8ed1b