commit 39ddeae0b647519f205e8d4cc334ad548ffe2ac8
author Ed Heyl <edheyl@google.com> Sun May 29 08:21:53 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Sun May 29 08:21:53 2011 -0700
tree 6dc4adba0b1af2275895cc24beb516b08cb9d038
parent 7e2181c0de51bd3671838c2e425e3b02973246fa
parent 62388cfc1fb2483eb6582ccb8e36d47f16bf01fa

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

telephony/java/com/android/internal/telephony/cdma/SmsMessage.java

diff --git a/telephony/java/com/android/internal/telephony/cdma/SmsMessage.java b/telephony/java/com/android/internal/telephony/cdma/SmsMessage.java
index 4911644..fdd0c9f 100644
--- a/telephony/java/com/android/internal/telephony/cdma/SmsMessage.java
+++ b/telephony/java/com/android/internal/telephony/cdma/SmsMessage.java
@@ -18,6 +18,7 @@
 
 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 @@
          * 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();