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

Merge "Avoid NPE caused by null encodedBearerData in privateGetSubmitPdu"

Browse Source
This commit is contained in:
Amit Mahajan
2019-02-07 01:31:18 +00:00
committed by Gerrit Code Review
parent 74a0dd8092 c692ce761b
commit f552341204
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
telephony/java/com/android/internal/telephony/cdma/SmsMessage.java
View File

@@ -858,11 +858,11 @@ public class SmsMessage extends SmsMessageBase {
bearerData.userData = userData; bearerData.userData = userData;
byte[] encodedBearerData = BearerData.encode(bearerData); byte[] encodedBearerData = BearerData.encode(bearerData);
if (encodedBearerData == null) return null;
if (Rlog.isLoggable(LOGGABLE_TAG, Log.VERBOSE)) { if (Rlog.isLoggable(LOGGABLE_TAG, Log.VERBOSE)) {
Rlog.d(LOG_TAG, "MO (encoded) BearerData = " + bearerData); Rlog.d(LOG_TAG, "MO (encoded) BearerData = " + bearerData);
Rlog.d(LOG_TAG, "MO raw BearerData = '" + HexDump.toHexString(encodedBearerData) + "'"); Rlog.d(LOG_TAG, "MO raw BearerData = '" + HexDump.toHexString(encodedBearerData) + "'");
} }
if (encodedBearerData == null) return null;
int teleservice = bearerData.hasUserDataHeader ? int teleservice = bearerData.hasUserDataHeader ?
SmsEnvelope.TELESERVICE_WEMT : SmsEnvelope.TELESERVICE_WMT; SmsEnvelope.TELESERVICE_WEMT : SmsEnvelope.TELESERVICE_WMT;