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

resolved conflicts for merge of a38fad37 to honeycomb-plus-aosp

Browse Source 
Conflicts:
	telephony/java/com/android/internal/telephony/cdma/SmsMessage.java

Change-Id: I4c808c752954c5d1f752f4b4c02ad41ea491e416
This commit is contained in:
Simon Wilson
2011-05-26 12:50:33 -07:00
parent 7f9d3210cb a38fad37c2
commit 62388cfc1f
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,6 +18,7 @@ package com.android.internal.telephony.cdma;
import android.os.Parcel;
import android.os.SystemProperties;
import android.telephony.PhoneNumberUtils;
import android.util.Config;
import android.util.Log;
import com.android.internal.telephony.IccUtils;
@@ -807,7 +808,12 @@ public class SmsMessage extends SmsMessageBase {
* mechanism, and avoid null pointer exceptions.
*/
CdmaSmsAddress destAddr = CdmaSmsAddress.parse(destAddrStr);
/**
* North America Plus Code :
* Convert + code to 011 and dial out for international SMS
*/
CdmaSmsAddress destAddr = CdmaSmsAddress.parse(
PhoneNumberUtils.cdmaCheckAndProcessPlusCode(destAddrStr));
if (destAddr == null) return null;
BearerData bearerData = new BearerData();