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

api/9.xml

+13 −10

Original line number	Diff line number	Diff line
		@@ -73399,16 +73399,6 @@
		visibility="public"
		>
		</field>
		<field name="CAMERA_ID_DEFAULT"
		type="int"
		transient="false"
		volatile="false"
		static="true"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		</class>
		<interface name="Camera.AutoFocusCallback"
		abstract="true"
		@@ -86967,6 +86957,19 @@
		<parameter name="listener" type="android.media.MediaRecorder.OnInfoListener">
		</parameter>
		</method>
		<method name="setOrientationHint"
		return="void"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="degrees" type="int">
		</parameter>
		</method>
		<method name="setOutputFile"
		return="void"
		abstract="false"

api/current.xml

+15 −25

Original line number	Diff line number	Diff line
		@@ -73399,16 +73399,6 @@
		visibility="public"
		>
		</field>
		<field name="CAMERA_ID_DEFAULT"
		type="int"
		transient="false"
		volatile="false"
		static="true"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		</class>
		<interface name="Camera.AutoFocusCallback"
		abstract="true"
		@@ -93873,7 +93863,7 @@
		type="android.net.SSLCertificateSocketFactory"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		<parameter name="handshakeTimeoutMillis" type="int">
		@@ -95973,7 +95963,7 @@
		type="android.net.http.SslCertificate"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		<parameter name="issuedTo" type="java.lang.String">
		@@ -96040,7 +96030,7 @@
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</method>
		@@ -96062,7 +96052,7 @@
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</method>
		@@ -172474,7 +172464,7 @@
		abstract="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		<constructor name="EventLogTags"
		@@ -202805,7 +202795,7 @@
		synchronized="true"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</method>
		@@ -203351,7 +203341,7 @@
		synchronized="true"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		<parameter name="flag" type="boolean">
		@@ -205476,7 +205466,7 @@
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		<parameter name="view" type="android.webkit.WebView">
		@@ -214009,7 +213999,7 @@
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</method>
		@@ -411714,7 +411704,7 @@
		abstract="true"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		<method name="getLength"
		@@ -412203,7 +412193,7 @@
		abstract="true"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		<method name="characters"
		@@ -412418,7 +412408,7 @@
		abstract="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		<implements name="org.xml.sax.DTDHandler">
		@@ -412885,7 +412875,7 @@
		abstract="true"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		<method name="parse"
		@@ -414317,7 +414307,7 @@
		abstract="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		<implements name="org.xml.sax.AttributeList">
		@@ -415806,7 +415796,7 @@
		abstract="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		<method name="makeParser"

core/java/android/hardware/Camera.java

+13 −11

Original line number	Diff line number	Diff line
		@@ -211,8 +211,7 @@ public class Camera {
		* blocking the main application UI thread.
		*
		* @param cameraId the hardware camera to access, between 0 and
		* {@link #getNumberOfCameras()}-1. Use {@link #CAMERA_ID_DEFAULT}
		* to access the default camera.
		* {@link #getNumberOfCameras()}-1.
		* @return a new Camera object, connected, locked and ready for use.
		* @throws RuntimeException if connection to the camera service fails (for
		* example, if the camera is in use by another process).
		@@ -222,18 +221,21 @@ public class Camera {
		}

		/**
		* The id for the default camera.
		* @see #open(int)
		*/
		public static int CAMERA_ID_DEFAULT = 0;

		/**
		* Equivalent to Camera.open(Camera.CAMERA_ID_DEFAULT).
		* Creates a new Camera object to access the default camera.
		* Creates a new Camera object to access the first back-facing camera on the
		* device. If the device does not have a back-facing camera, this returns
		* null.
		* @see #open(int)
		*/
		public static Camera open() {
		return new Camera(CAMERA_ID_DEFAULT);
		int numberOfCameras = getNumberOfCameras();
		CameraInfo cameraInfo = new CameraInfo();
		for (int i = 0; i < numberOfCameras; i++) {
		getCameraInfo(i, cameraInfo);
		if (cameraInfo.facing == CameraInfo.CAMERA_FACING_BACK) {
		return new Camera(i);
		}
		}
		return null;
		}

		Camera(int cameraId) {

core/java/android/hardware/SensorEvent.java

+55 −1

Original line number	Diff line number	Diff line
		@@ -111,6 +111,27 @@ public class SensorEvent {
		* This can be achieved by applying a <i>high-pass</i> filter. Conversely, a
		* <i>low-pass</i> filter can be used to isolate the force of gravity.
		* </p>
		*
		* <pre class="prettyprint">
		*
		* public void onSensorChanged(SensorEvent event)
		* {
		* // alpha is calculated as t / (t + dT)
		* // with t, the low-pass filter's time-constant
		* // and dT, the event delivery rate
		*
		* final float alpha = 0.8;
		*
		* gravity[0] = alpha * gravity[0] + (1 - alpha) * event.data[0];
		* gravity[1] = alpha * gravity[1] + (1 - alpha) * event.data[1];
		* gravity[2] = alpha * gravity[2] + (1 - alpha) * event.data[2];
		*
		* linear_acceleration[0] = event.data[0] - gravity[0];
		* linear_acceleration[1] = event.data[1] - gravity[1];
		* linear_acceleration[2] = event.data[2] - gravity[2];
		* }
		* </pre>
		*
		* <p>
		* <u>Examples</u>:
		* <ul>
		@@ -143,8 +164,41 @@ public class SensorEvent {
		* standard mathematical definition of positive rotation and does not agree with the
		* definition of roll given earlier.
		*
		* <h4>{@link android.hardware.Sensor#TYPE_LIGHT Sensor.TYPE_LIGHT}:</h4>
		* <ul>
		* <p>
		* values[0]: Angular speed around the x-axis
		* </p>
		* <p>
		* values[1]: Angular speed around the y-axis
		* </p>
		* <p>
		* values[2]: Angular speed around the z-axis
		* </p>
		* </ul>
		* <p>
		* Typically the output of the gyroscope is integrated over time to calculate
		* an angle, for example:
		* </p>
		* <pre class="prettyprint">
		* private static final float NS2S = 1.0f / 1000000000.0f;
		* private float timestamp;
		* public void onSensorChanged(SensorEvent event)
		* {
		* if (timestamp != 0) {
		* final float dT = (event.timestamp - timestamp) * NS2S;
		* angle[0] += event.data[0] * dT;
		* angle[1] += event.data[1] * dT;
		* angle[2] += event.data[2] * dT;
		* }
		* timestamp = event.timestamp;
		* }
		* </pre>
		*
		* <p>In practice, the gyroscope noise and offset will introduce some errors which need
		* to be compensated for. This is usually done using the information from other
		* sensors, but is beyond the scope of this document.</p>
		*
		* <h4>{@link android.hardware.Sensor#TYPE_LIGHT Sensor.TYPE_LIGHT}:</h4>
		* <ul>
		* <p>
		* values[0]: Ambient light level in SI lux units

core/java/android/net/SSLCertificateSocketFactory.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -102,6 +102,7 @@ public class SSLCertificateSocketFactory extends SSLSocketFactory {
		private final boolean mSecure;

		/** @deprecated Use {@link #getDefault(int)} instead. */
		@Deprecated
		public SSLCertificateSocketFactory(int handshakeTimeoutMillis) {
		this(handshakeTimeoutMillis, null, true);
		}