merge from froyo-plus-aosp (cefdedc3) · Commits · e / os / android_frameworks_base

graphics/java/android/graphics/Canvas.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -1221,7 +1221,7 @@ public class Canvas {
		checkRange(texs.length, texOffset, vertexCount);
		}
		if (colors != null) {
		checkRange(colors.length, colorOffset, vertexCount);
		checkRange(colors.length, colorOffset, vertexCount / 2);
		}
		if (indices != null) {
		checkRange(indices.length, indexOffset, indexCount);

+21 −9

Original line number	Diff line number	Diff line
		@@ -1119,7 +1119,7 @@ public class PhoneNumberUtils
		&& text.charAt(2) == '1') {
		formatType = FORMAT_JAPAN;
		} else {
		return;
		formatType = FORMAT_UNKNOWN;
		}
		}

		@@ -1130,6 +1130,9 @@ public class PhoneNumberUtils
		case FORMAT_JAPAN:
		formatJapaneseNumber(text);
		return;
		case FORMAT_UNKNOWN:
		removeDashes(text);
		return;
		}
		}

		@@ -1165,14 +1168,7 @@ public class PhoneNumberUtils
		CharSequence saved = text.subSequence(0, length);

		// Strip the dashes first, as we're going to add them back
		int p = 0;
		while (p < text.length()) {
		if (text.charAt(p) == '-') {
		text.delete(p, p + 1);
		} else {
		p++;
		}
		}
		removeDashes(text);
		length = text.length();

		// When scanning the number we record where dashes need to be added,
		@@ -1276,6 +1272,22 @@ public class PhoneNumberUtils
		JapanesePhoneNumberFormatter.format(text);
		}

		/**
		* Removes all dashes from the number.
		*
		* @param text the number to clear from dashes
		*/
		private static void removeDashes(Editable text) {
		int p = 0;
		while (p < text.length()) {
		if (text.charAt(p) == '-') {
		text.delete(p, p + 1);
		} else {
		p++;
		}
		}
		}

		// Three and four digit phone numbers for either special services,
		// or 3-6 digit addresses from the network (eg carrier-originated SMS messages) should
		// not match.