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

Commit 70dad6e7 authored by Xia Ying's avatar Xia Ying Committed by John Huang
Browse files

Assisted dialing support of MO SMS 

This is special for VZW requirement. Follow the specificaitons
of assisted dialing of MO SMS while traveling on VZW CDMA,
international CDMA or GSM markets.

Change-Id: I8976e596040e9eab9e4bc5168fc68e9d976c4df5
parent 697e7f47

src/java/com/android/internal/telephony/IccSmsInterfaceManager.java

+12 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ import com.android.internal.telephony.cdma.CdmaSmsBroadcastConfigInfo; 
import com.android.internal.telephony.uicc.IccConstants;

import com.android.internal.telephony.uicc.IccFileHandler;

import com.android.internal.telephony.uicc.UiccController;

import com.android.internal.telephony.SmsNumberUtils;

import com.android.internal.util.HexDump;



import java.util.ArrayList;
@@ -355,6 +356,7 @@ public class IccSmsInterfaceManager { 
                callingPackage) != AppOpsManager.MODE_ALLOWED) {

            return;

        }

        destAddr = filterDestAddress(destAddr);

        mDispatcher.sendData(destAddr, scAddr, destPort, data, sentIntent, deliveryIntent);

    }
@@ -397,6 +399,7 @@ public class IccSmsInterfaceManager { 
                callingPackage) != AppOpsManager.MODE_ALLOWED) {

            return;

        }

        destAddr = filterDestAddress(destAddr);

        mDispatcher.sendText(destAddr, scAddr, text, sentIntent, deliveryIntent,

                null/*messageUri*/, callingPackage);

    }
@@ -904,6 +907,7 @@ public class IccSmsInterfaceManager { 
            returnUnspecifiedFailure(sentIntent);

            return;

        }

        textAndAddress[1] = filterDestAddress(textAndAddress[1]);

        mDispatcher.sendText(textAndAddress[1], scAddress, textAndAddress[0],

                sentIntent, deliveryIntent, messageUri, callingPkg);

    }
@@ -963,6 +967,7 @@ public class IccSmsInterfaceManager { 
            return;

        }



        textAndAddress[1] = filterDestAddress(textAndAddress[1]);

        mDispatcher.sendMultipartText(

                textAndAddress[1], // destAddress

                scAddress,
@@ -1063,4 +1068,11 @@ public class IccSmsInterfaceManager { 
            throw new SecurityException("No Carrier Privilege.");

        }

    }



    private String filterDestAddress(String destAddr) {

        String result  = null;

        result = SmsNumberUtils.filterDestAddr(mContext, destAddr);

        return result != null ? result : destAddr;

    }



}

src/java/com/android/internal/telephony/SmsNumberUtils.java

0 → 100644
+598 −0

File added.

Preview size limit exceeded, changes collapsed.