Merge branch 'eclair' of git://github.com/cyanogen/android_frameworks_base into eclair (37daa577) · Commits · e / os / android_frameworks_base

core/java/android/hardware/Camera.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -1093,6 +1093,9 @@ public class Camera {
		*/
		public List<Integer> getSupportedPreviewFormats() {
		String str = get(KEY_PREVIEW_FORMAT + SUPPORTED_VALUES_SUFFIX);
		if (str == null) {
		str = get(KEY_PREVIEW_FORMAT);
		}
		ArrayList<Integer> formats = new ArrayList<Integer>();
		for (String s : split(str)) {
		int f = pixelFormatForCameraFormat(s);

+6 −2

Original line number	Diff line number	Diff line
		@@ -124,8 +124,12 @@ public final class GsmMmiCode extends Handler implements MmiCode {

		// See TS 22.030 6.5.2 "Structure of the MMI"

		// Note that some nonstandard MMI codes seem to end with an asterisk, eg. "#1901660#"
		// (http://code.google.com/p/android/issues/detail?id=2226). Make sure this doesn't get
		// merged into MATCH_GROUP_DIALING_NUMBER.

		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 #
		@@ -134,7 +138,7 @@ public final class GsmMmiCode extends Handler implements MmiCode {
		5 = SIA
		7 = SIB
		9 = SIC
		10 = dialing number
		12 = dialing number
		*/

		static final int MATCH_GROUP_POUND_STRING = 1;