Skip to content

Commit d3e318a

Browse files
committed
Merge remote branch 'cyanogen/jellybean' into jellybean
2 parents d4a0620 + b455ae4 commit d3e318a

1 file changed

Lines changed: 3 additions & 0 deletions

File tree

src/com/android/phone/BluetoothSMSAccess.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -596,6 +596,9 @@ private AtCommandResult CreatePDUResponse(SMSMsgInfo smsInfo) {
596596
bo.write(4); // flags
597597

598598
byte[] destData = PhoneNumberUtils.networkPortionToCalledPartyBCD(smsInfo.OriginAddress);
599+
if( destData == null )
600+
return new AtCommandResult(AtCommandResult.ERROR);
601+
599602
int destLength = ((destData.length - 1) * 2
600603
- ((destData[destData.length - 1] & 0xf0) == 0xf0 ? 1 : 0));
601604

0 commit comments

Comments
 (0)