Merge "Correct the dialing number of structured MMI." into ics-mr1 (ca0a68cc) · Commits · e / os / android_frameworks_base

telephony/java/com/android/internal/telephony/gsm/GsmMmiCode.java

+18 −2

Original line number	Diff line number	Diff line
		@@ -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. SCnSI#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();
		}
		}