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" am: f552341204

Browse Source 
am: 9776c4cce3

Change-Id: Ie25b00f0eada559b2752cf9f15e4fd34634f3e24
This commit is contained in:
Amit Mahajan
2019-02-06 17:58:55 -08:00
committed by android-build-merger
parent a162557ea4 9776c4cce3
commit e6b6ea85f3
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;
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;