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

Merge change 9260

Browse Source 
* changes:
  Fix crash while dialing "*228;1"
This commit is contained in:
Android (Google) Code Review
2009-07-30 16:14:38 -07:00
parent 20b8e3a347 d903014c1f
commit 992c1ebda1
1 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java
View File

@@ -1338,25 +1338,26 @@ public class CDMAPhone extends PhoneBase {
return isOtaSpNum;
}
/**
* isOTASPNumber: checks a given number against the IS-683A OTASP dial string and carrier
* OTASP dial string.
*
* @param dialStr the number to look up.
* @return true if the number is in IS-683A OTASP dial string or carrier OTASP dial string
*/
/**
* isOTASPNumber: checks a given number against the IS-683A OTASP dial string and carrier
* OTASP dial string.
*
* @param dialStr the number to look up.
* @return true if the number is in IS-683A OTASP dial string or carrier OTASP dial string
*/
@Override
public boolean isOtaSpNumber(String dialStr){
boolean isOtaSpNum = false;
if (dialStr != null) {
isOtaSpNum = isIs683OtaSpDialStr(dialStr);
if(isOtaSpNum == false){
isOtaSpNum = isCarrierOtaSpNum(dialStr);
}
}
if (DBG) Log.d(LOG_TAG, "isOtaSpNumber " + isOtaSpNum);
return isOtaSpNum;
}
public boolean isOtaSpNumber(String dialStr){
boolean isOtaSpNum = false;
String dialableStr = PhoneNumberUtils.extractNetworkPortion(dialStr);
if (dialableStr != null) {
isOtaSpNum = isIs683OtaSpDialStr(dialableStr);
if (isOtaSpNum == false) {
isOtaSpNum = isCarrierOtaSpNum(dialableStr);
}
}
if (DBG) Log.d(LOG_TAG, "isOtaSpNumber " + isOtaSpNum);
return isOtaSpNum;
}
@Override
public int getCdmaEriIconIndex() {