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

api/current.xml

+46 −0

Original line number	Diff line number	Diff line
		@@ -6961,6 +6961,17 @@
		visibility="public"
		>
		</field>
		<field name="screenDensity"
		type="int"
		transient="false"
		volatile="false"
		value="16843467"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="screenOrientation"
		type="int"
		transient="false"
		@@ -6972,6 +6983,17 @@
		visibility="public"
		>
		</field>
		<field name="screenSize"
		type="int"
		transient="false"
		volatile="false"
		value="16843466"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="scrollHorizontally"
		type="int"
		transient="false"
		@@ -126796,6 +126818,19 @@
		<exception name="IOException" type="java.io.IOException">
		</exception>
		</method>
		<method name="createPipe"
		return="android.os.ParcelFileDescriptor[]"
		abstract="false"
		native="false"
		synchronized="false"
		static="true"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<exception name="IOException" type="java.io.IOException">
		</exception>
		</method>
		<method name="describeContents"
		return="int"
		abstract="false"
		@@ -172683,6 +172718,17 @@
		visibility="public"
		>
		</field>
		<field name="DENSITY_XHIGH"
		type="int"
		transient="false"
		volatile="false"
		value="320"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="density"
		type="float"
		transient="false"

+15 −13

Original line number	Diff line number	Diff line
		@@ -216,6 +216,7 @@ int main(int argc, char *argv[]) {
		fclose(cmdline);
		}

		if (getuid() == 0) {
		/* switch to non-root user and group */
		gid_t groups[] = { AID_LOG, AID_SDCARD_RW, AID_MOUNT };
		if (setgroups(sizeof(groups)/sizeof(groups[0]), groups) != 0) {
		@@ -230,6 +231,7 @@ int main(int argc, char *argv[]) {
		LOGE("Unable to setuid, aborting: %s\n", strerror(errno));
		return -1;
		}
		}

		char path[PATH_MAX], tmp_path[PATH_MAX];
		pid_t gzip_pid = -1;

+10 −0

Original line number	Diff line number	Diff line
		@@ -1080,6 +1080,16 @@ public class PackageParser {

		XmlUtils.skipCurrentTag(parser);

		} else if (tagName.equals("uses-gl-texture")) {
		// Just skip this tag
		XmlUtils.skipCurrentTag(parser);
		continue;

		} else if (tagName.equals("compatible-screens")) {
		// Just skip this tag
		XmlUtils.skipCurrentTag(parser);
		continue;

		} else if (tagName.equals("eat-comment")) {
		// Just skip this tag
		XmlUtils.skipCurrentTag(parser);

+3 −3

Original line number	Diff line number	Diff line
		@@ -779,9 +779,9 @@ public class Camera {
		* Set the clockwise rotation of preview display in degrees. This affects
		* the preview frames and the picture displayed after snapshot. This method
		* is useful for portrait mode applications. Note that preview display of
		* front-facing cameras is flipped horizontally, that is, the image is
		* reflected along the central vertical axis of the camera sensor. So the
		* users can see themselves as looking into a mirror.
		* front-facing cameras is flipped horizontally before the rotation, that
		* is, the image is reflected along the central vertical axis of the camera
		* sensor. So the users can see themselves as looking into a mirror.
		*
		* This does not affect the order of byte array passed in {@link
		* PreviewCallback#onPreviewFrame}, JPEG pictures, or recorded videos. This

+19 −0

Original line number	Diff line number	Diff line
		@@ -133,6 +133,25 @@ public class ParcelFileDescriptor implements Parcelable {
		// Extracts the file descriptor from the specified socket and returns it untouched
		private static native FileDescriptor getFileDescriptorFromSocket(Socket socket);

		/**
		* Create two ParcelFileDescriptors structured as a data pipe. The first
		* ParcelFileDescriptor in the returned array is the read side; the second
		* is the write side.
		*/
		public static ParcelFileDescriptor[] createPipe() throws IOException {
		FileDescriptor[] fds = new FileDescriptor[2];
		int res = createPipeNative(fds);
		if (res == 0) {
		ParcelFileDescriptor[] pfds = new ParcelFileDescriptor[2];
		pfds[0] = new ParcelFileDescriptor(fds[0]);
		pfds[1] = new ParcelFileDescriptor(fds[1]);
		return pfds;
		}
		throw new IOException("Unable to create pipe: errno=" + -res);
		}

		private static native int createPipeNative(FileDescriptor[] outFds);

		/**
		* Retrieve the actual FileDescriptor associated with this object.
		*