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

am ca0a68cc: Merge "Correct the dialing number of structured MMI." into ics-mr1

Browse Source 
* commit 'ca0a68cc8afd023c94bcd5a1f3f2b2f9407fbe3b':
  Correct the dialing number of structured MMI.
This commit is contained in:
John Wang
2011-12-07 18:51:11 -08:00
committed by Android Git Automerger
parent 0235016acb ca0a68cc8a
commit 2de0b07f47
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
telephony/java/com/android/internal/telephony/gsm/GsmMmiCode.java
View File

@@ -132,7 +132,7 @@ public final class GsmMmiCode extends Handler implements MmiCode {
// See TS 22.030 6.5.2 "Structure of the MMI" // See TS 22.030 6.5.2 "Structure of the MMI"
static Pattern sPatternSuppService = Pattern.compile( static Pattern sPatternSuppService = Pattern.compile(
"((\\*|#|\\*#|\\*\\*|##)(\\d{2,3})(\\*([^*#]*)(\\*([^*#]*)(\\*([^*#]*)(\\*([^*#]*))?)?)?)?#)(.*)"); "((\\*|#|\\*#|\\*\\*|##)(\\d{2,3})(\\*([^*#]*)(\\*([^*#]*)(\\*([^*#]*)(\\*([^*#]*))?)?)?)?#)([^#]*)");
/* 1 2 3 4 5 6 7 8 9 10 11 12 /* 1 2 3 4 5 6 7 8 9 10 11 12
1 = Full string up to and including # 1 = Full string up to and including #
@@ -141,7 +141,7 @@ public final class GsmMmiCode extends Handler implements MmiCode {
5 = SIA 5 = SIA
7 = SIB 7 = SIB
9 = SIC 9 = SIC
10 = dialing number 10 = dialing number which must not include #, e.g. *SCn*SI#DN format
*/ */
static final int MATCH_GROUP_POUND_STRING = 1; static final int MATCH_GROUP_POUND_STRING = 1;
@@ -1338,4 +1338,20 @@ public final class GsmMmiCode extends Handler implements MmiCode {
* SpecialCharSequenceMgr class. * SpecialCharSequenceMgr class.
*/ */
@Override
public String toString() {
StringBuilder sb = new StringBuilder("GsmMmiCode {");
sb.append("State=" + getState());
if (action != null) sb.append(" action=" + action);
if (sc != null) sb.append(" sc=" + sc);
if (sia != null) sb.append(" sia=" + sia);
if (sib != null) sb.append(" sib=" + sib);
if (sic != null) sb.append(" sic=" + sic);
if (poundString != null) sb.append(" poundString=" + poundString);
if (dialingNumber != null) sb.append(" dialingNumber=" + dialingNumber);
if (pwd != null) sb.append(" pwd=" + pwd);
sb.append("}");
return sb.toString();
}
} }