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

Merge "resolved conflicts for merge of a38fad37 to honeycomb-plus-aosp" into honeycomb-plus-aosp

Browse Source
This commit is contained in:
Ed Heyl
2011-05-29 08:21:53 -07:00
committed by Android (Google) Code Review
parent 7e2181c0de 62388cfc1f
commit 39ddeae0b6
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.Parcel;
import android.os.SystemProperties; import android.os.SystemProperties;
import android.telephony.PhoneNumberUtils;
import android.util.Config; import android.util.Config;
import android.util.Log; import android.util.Log;
import com.android.internal.telephony.IccUtils; import com.android.internal.telephony.IccUtils;
@@ -807,7 +808,12 @@ public class SmsMessage extends SmsMessageBase {
* mechanism, and avoid null pointer exceptions. * 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; if (destAddr == null) return null;
BearerData bearerData = new BearerData(); BearerData bearerData = new BearerData();