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

Merge "Replace the IDD with the '+' sign" am: 3fdedfab76

Browse Source 
am: a187edb117

Change-Id: Idcd55e1c7f2a0d62ac3c966ebd1678450f173b9a
This commit is contained in:
Amit Mahajan
2019-06-21 10:23:14 -07:00
committed by android-build-merger
parent 6f916a687c a187edb117
commit d364e2a7fb
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,6 +16,9 @@
package com.android.internal.telephony.cdma;
import static com.android.internal.telephony.TelephonyProperties.PROPERTY_OPERATOR_IDP_STRING;
import android.content.res.Resources;
import android.os.Parcel;
import android.os.SystemProperties;
import android.telephony.PhoneNumberUtils;
@@ -23,9 +26,8 @@ import android.telephony.SmsCbLocation;
import android.telephony.SmsCbMessage;
import android.telephony.cdma.CdmaSmsCbProgramData;
import android.telephony.Rlog;
import android.util.Log;
import android.text.TextUtils;
import android.content.res.Resources;
import android.util.Log;
import com.android.internal.telephony.GsmAlphabet.TextEncodingDetails;
import com.android.internal.telephony.SmsAddress;
@@ -750,8 +752,16 @@ public class SmsMessage extends SmsMessageBase {
}
private void decodeSmsDisplayAddress(SmsAddress addr) {
// PCD(Plus Code Dialing)
// 1) Replaces IDD(International Direct Dialing) with the '+' if address starts with it.
// TODO: Skip it for EF SMS(SUBMIT and DELIVER) because the IDD depends on current network?
// 2) Adds the '+' prefix if TON is International
// 3) Keeps the '+' if address starts with the '+'
String idd = SystemProperties.get(PROPERTY_OPERATOR_IDP_STRING, null);
addr.address = new String(addr.origBytes);
if (addr.ton == CdmaSmsAddress.TON_INTERNATIONAL_OR_IP) {
if (!TextUtils.isEmpty(idd) && addr.address.startsWith(idd)) {
addr.address = "+" + addr.address.substring(idd.length());
} else if (addr.ton == CdmaSmsAddress.TON_INTERNATIONAL_OR_IP) {
if (addr.address.charAt(0) != '+') {
addr.address = "+" + addr.address;
}