diff options
| author | John Wang <johnwang@google.com> | 2011-12-07 19:03:42 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-07 19:03:42 -0800 |
| commit | 10fd37dd9e502d40057abb8ab85614552b78b7ad (patch) | |
| tree | e0474aa525abec76626bf623f7b7aedf6af05236 /telephony | |
| parent | b69c8cab56cffb4799e6701e3a52da9242b0569d (diff) | |
| parent | 2de0b07f47c3561b6e550ff630901d2776a437e3 (diff) | |
| download | frameworks_base-10fd37dd9e502d40057abb8ab85614552b78b7ad.zip frameworks_base-10fd37dd9e502d40057abb8ab85614552b78b7ad.tar.gz frameworks_base-10fd37dd9e502d40057abb8ab85614552b78b7ad.tar.bz2 | |
am 2de0b07f: am ca0a68cc: Merge "Correct the dialing number of structured MMI." into ics-mr1
* commit '2de0b07f47c3561b6e550ff630901d2776a437e3':
Correct the dialing number of structured MMI.
Diffstat (limited to 'telephony')
| -rw-r--r-- | telephony/java/com/android/internal/telephony/gsm/GsmMmiCode.java | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/telephony/java/com/android/internal/telephony/gsm/GsmMmiCode.java b/telephony/java/com/android/internal/telephony/gsm/GsmMmiCode.java index 3799894..16d3129 100644 --- a/telephony/java/com/android/internal/telephony/gsm/GsmMmiCode.java +++ b/telephony/java/com/android/internal/telephony/gsm/GsmMmiCode.java @@ -132,7 +132,7 @@ public final class GsmMmiCode extends Handler implements MmiCode { // See TS 22.030 6.5.2 "Structure of the MMI" static Pattern sPatternSuppService = Pattern.compile( - "((\\*|#|\\*#|\\*\\*|##)(\\d{2,3})(\\*([^*#]*)(\\*([^*#]*)(\\*([^*#]*)(\\*([^*#]*))?)?)?)?#)(.*)"); + "((\\*|#|\\*#|\\*\\*|##)(\\d{2,3})(\\*([^*#]*)(\\*([^*#]*)(\\*([^*#]*)(\\*([^*#]*))?)?)?)?#)([^#]*)"); /* 1 2 3 4 5 6 7 8 9 10 11 12 1 = Full string up to and including # @@ -141,7 +141,7 @@ public final class GsmMmiCode extends Handler implements MmiCode { 5 = SIA 7 = SIB 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; @@ -1338,4 +1338,20 @@ public final class GsmMmiCode extends Handler implements MmiCode { * 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(); + } } |