Merge branch 'gingerbread' into gingerbread-release (2c964fa1) · Commits · e / os / android_frameworks_base

Android.mk

+0 −6

Original line number	Diff line number	Diff line
		@@ -118,10 +118,6 @@ LOCAL_SRC_FILES += \
		core/java/android/net/IThrottleManager.aidl \
		core/java/android/os/IHardwareService.aidl \
		core/java/android/os/IMessenger.aidl \
		core/java/android/os/storage/IMountService.aidl \
		core/java/android/os/storage/IMountServiceListener.aidl \
		core/java/android/os/storage/IMountShutdownObserver.aidl \
		core/java/android/os/storage/IObbActionListener.aidl \
		core/java/android/os/INetworkManagementService.aidl \
		core/java/android/os/INetStatService.aidl \
		core/java/android/os/IPermissionController.aidl \
		@@ -375,8 +371,6 @@ sample_dir := development/samples
		# (see development/build/sdk.atree)
		web_docs_sample_code_flags := \
		-hdf android.hasSamples 1 \
		-samplecode $(sample_dir)/AccessibilityService \
		resources/samples/AccessibilityService "Accessibility Service" \
		-samplecode $(sample_dir)/ApiDemos \
		resources/samples/ApiDemos "API Demos" \
		-samplecode $(sample_dir)/BackupRestore \

CleanSpec.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -67,6 +67,7 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libequalizerte
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libreverb_intermediates)
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libreverbtest_intermediates)
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/soundfx/)
		$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/android/os/storage/*)

		# ************************************************
		# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

api/current.xml

+15 −2

Original line number	Diff line number	Diff line
		@@ -246506,7 +246506,7 @@
		<method name="copySign"
		return="double"
		abstract="false"
		native="true"
		native="false"
		synchronized="false"
		static="true"
		final="false"
		@@ -246521,7 +246521,7 @@
		<method name="copySign"
		return="float"
		abstract="false"
		native="true"
		native="false"
		synchronized="false"
		static="true"
		final="false"
		@@ -264957,6 +264957,19 @@
		<parameter name="p" type="java.security.Permission">
		</parameter>
		</method>
		<method name="isValidIP6Address"
		return="boolean"
		abstract="false"
		native="false"
		synchronized="false"
		static="true"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="ipAddress" type="java.lang.String">
		</parameter>
		</method>
		</class>
		<class name="SocketTimeoutException"
		extends="java.io.InterruptedIOException"

core/java/android/content/pm/ApplicationInfo.java

+10 −8

Original line number	Diff line number	Diff line
		@@ -389,15 +389,17 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {
		if (permission != null) {
		pw.println(prefix + "permission=" + permission);
		}
		pw.println(prefix + "uid=" + uid + " taskAffinity=" + taskAffinity);
		if (theme != 0) {
		pw.println(prefix + "theme=0x" + Integer.toHexString(theme));
		}
		pw.println(prefix + "flags=0x" + Integer.toHexString(flags)
		+ " processName=" + processName);
		pw.println(prefix + "processName=" + processName);
		pw.println(prefix + "taskAffinity=" + taskAffinity);
		pw.println(prefix + "uid=" + uid + " flags=0x" + Integer.toHexString(flags)
		+ " theme=0x" + Integer.toHexString(theme));
		pw.println(prefix + "sourceDir=" + sourceDir);
		if (!sourceDir.equals(publicSourceDir)) {
		pw.println(prefix + "publicSourceDir=" + publicSourceDir);
		}
		if (resourceDirs != null) {
		pw.println(prefix + "resourceDirs=" + resourceDirs);
		}
		pw.println(prefix + "dataDir=" + dataDir);
		if (sharedLibraryFiles != null) {
		pw.println(prefix + "sharedLibraryFiles=" + sharedLibraryFiles);

core/java/android/hardware/Camera.java

+116 −11

Original line number	Diff line number	Diff line
		@@ -960,6 +960,7 @@ public class Camera {
		private static final String KEY_PREVIEW_SIZE = "preview-size";
		private static final String KEY_PREVIEW_FORMAT = "preview-format";
		private static final String KEY_PREVIEW_FRAME_RATE = "preview-frame-rate";
		private static final String KEY_PREVIEW_FPS_RANGE = "preview-fps-range";
		private static final String KEY_PICTURE_SIZE = "picture-size";
		private static final String KEY_PICTURE_FORMAT = "picture-format";
		private static final String KEY_JPEG_THUMBNAIL_SIZE = "jpeg-thumbnail-size";
		@@ -1219,6 +1220,22 @@ public class Camera {
		*/
		public static final String METERING_MODE_SPOT = "spot";

		/**
		* The array index of minimum preview fps for use with {@link
		* #getPreviewFpsRange(int[])} or {@link
		* #getSupportedPreviewFpsRange()}.
		* @hide
		*/
		public static final int PREVIEW_FPS_MIN_INDEX = 0;

		/**
		* The array index of maximum preview fps for use with {@link
		* #getPreviewFpsRange(int[])} or {@link
		* #getSupportedPreviewFpsRange()}.
		* @hide
		*/
		public static final int PREVIEW_FPS_MAX_INDEX = 1;

		// Formats for setPreviewFormat and setPictureFormat.
		private static final String PIXEL_FORMAT_YUV422SP = "yuv422sp";
		private static final String PIXEL_FORMAT_YUV420SP = "yuv420sp";
		@@ -1481,6 +1498,64 @@ public class Camera {
		return splitInt(str);
		}

		/**
		* Sets the maximum and maximum preview fps. This controls the rate of
		* preview frames received in {@link #PreviewCallback}. The minimum and
		* maximum preview fps must be one of the elements from {@link
		* #getSupportedPreviewFpsRange}.
		*
		* @param min the minimum preview fps (scaled by 1000).
		* @param max the maximum preview fps (scaled by 1000).
		* @throws RuntimeException if fps range is invalid.
		* @see #setPreviewCallbackWithBuffer(Camera.PreviewCallback)
		* @see #getSupportedPreviewFpsRange()
		* @hide
		*/
		public void setPreviewFpsRange(int min, int max) {
		set(KEY_PREVIEW_FPS_RANGE, "" + min + "," + max);
		}

		/**
		* Returns the current minimum and maximum preview fps. The values are
		* one of the elements returned by {@link #getSupportedPreviewFpsRange}.
		*
		* @return range the minimum and maximum preview fps (scaled by 1000).
		* @see #PREVIEW_FPS_MIN_INDEX
		* @see #PREVIEW_FPS_MAX_INDEX
		* @see #getSupportedPreviewFpsRange()
		* @hide
		*/
		public void getPreviewFpsRange(int[] range) {
		if (range == null \|\| range.length != 2) {
		throw new IllegalArgumentException(
		"range must be an float array with two elements.");
		}
		splitInt(get(KEY_PREVIEW_FPS_RANGE), range);
		}

		/**
		* Gets the supported preview fps (frame-per-second) ranges. Each range
		* contains a minimum fps and maximum fps. If minimum fps equals to
		* maximum fps, the camera outputs frames in fixed frame rate. If not,
		* the camera outputs frames in auto frame rate. The actual frame rate
		* fluctuates between the minimum and the maximum. The values are
		* multiplied by 1000 and represented in integers. For example, if frame
		* rate is 26.623 frames per second, the value is 26623.
		*
		* @return a list of supported preview fps ranges. This method returns a
		* list with at least one element. Every element is an int array
		* of two values - minimum fps and maximum fps. The list is
		* sorted from small to large (first by maximum fps and then
		* minimum fps).
		* @see #PREVIEW_FPS_MIN_INDEX
		* @see #PREVIEW_FPS_MAX_INDEX
		* @hide
		*/
		public List<int[]> getSupportedPreviewFpsRange() {
		String str = get(KEY_PREVIEW_FPS_RANGE + SUPPORTED_VALUES_SUFFIX);
		return splitRange(str);
		}

		/**
		* Sets the image format for preview pictures.
		* <p>If this is never called, the default format will be
		@@ -2184,10 +2259,7 @@ public class Camera {
		throw new IllegalArgumentException(
		"output must be an float array with three elements.");
		}
		List<Float> distances = splitFloat(get(KEY_FOCUS_DISTANCES));
		output[0] = distances.get(0);
		output[1] = distances.get(1);
		output[2] = distances.get(2);
		splitFloat(get(KEY_FOCUS_DISTANCES), output);
		}

		/**
		@@ -2255,19 +2327,27 @@ public class Camera {
		return substrings;
		}

		private void splitInt(String str, int[] output) {
		if (str == null) return;

		StringTokenizer tokenizer = new StringTokenizer(str, ",");
		int index = 0;
		while (tokenizer.hasMoreElements()) {
		String token = tokenizer.nextToken();
		output[index++] = Integer.parseInt(token);
		}
		}

		// Splits a comma delimited string to an ArrayList of Float.
		// Return null if the passing string is null or the size is 0.
		private ArrayList<Float> splitFloat(String str) {
		if (str == null) return null;
		private void splitFloat(String str, float[] output) {
		if (str == null) return;

		StringTokenizer tokenizer = new StringTokenizer(str, ",");
		ArrayList<Float> substrings = new ArrayList<Float>();
		int index = 0;
		while (tokenizer.hasMoreElements()) {
		String token = tokenizer.nextToken();
		substrings.add(Float.parseFloat(token));
		output[index++] = Float.parseFloat(token);
		}
		if (substrings.size() == 0) return null;
		return substrings;
		}

		// Returns the value of a float parameter.
		@@ -2318,5 +2398,30 @@ public class Camera {
		Log.e(TAG, "Invalid size parameter string=" + str);
		return null;
		}

		// Splits a comma delimited string to an ArrayList of int array.
		// Example string: "(10000,26623),(10000,30000)". Return null if the
		// passing string is null or the size is 0.
		private ArrayList<int[]> splitRange(String str) {
		if (str == null \|\| str.charAt(0) != '('
		\|\| str.charAt(str.length() - 1) != ')') {
		Log.e(TAG, "Invalid range list string=" + str);
		return null;
		}

		ArrayList<int[]> rangeList = new ArrayList<int[]>();
		int endIndex, fromIndex = 1;
		do {
		int[] range = new int[2];
		endIndex = str.indexOf("),(", fromIndex);
		if (endIndex == -1) endIndex = str.length() - 1;
		splitInt(str.substring(fromIndex, endIndex), range);
		rangeList.add(range);
		fromIndex = endIndex + 3;
		} while (endIndex != str.length() - 1);

		if (rangeList.size() == 0) return null;
		return rangeList;
		}
		};
		}