Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62388cfc authored by Simon Wilson's avatar Simon Wilson
Browse files

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

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

Change-Id: I4c808c752954c5d1f752f4b4c02ad41ea491e416
parents 7f9d3210 a38fad37

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

+7 −1
Original line number Diff line number Diff line
@@ -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();