Merge remote branch 'ohd/gingerbread' into merge (609b3e42) · Commits · e / os / android_frameworks_base

Android.mk

+8 −4

Original line number	Diff line number	Diff line
		@@ -387,8 +387,12 @@ 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)/AccelerometerPlay \
		resources/samples/AccelerometerPlay "Accelerometer Play" \
		-samplecode $(sample_dir)/BackupRestore \
		resources/samples/BackupRestore "Backup and Restore" \
		-samplecode $(sample_dir)/BluetoothChat \
		@@ -401,8 +405,6 @@ web_docs_sample_code_flags := \
		resources/samples/CubeLiveWallpaper "Live Wallpaper" \
		-samplecode $(sample_dir)/Home \
		resources/samples/Home "Home" \
		-samplecode $(sample_dir)/HeavyWeight \
		resources/samples/HeavyWeight "Heavy Weight App" \
		-samplecode $(sample_dir)/JetBoy \
		resources/samples/JetBoy "JetBoy" \
		-samplecode $(sample_dir)/LunarLander \
		@@ -434,11 +436,13 @@ web_docs_sample_code_flags := \
		-samplecode $(sample_dir)/WiktionarySimple \
		resources/samples/WiktionarySimple "Wiktionary (Simplified)" \
		-samplecode $(sample_dir)/VoiceRecognitionService \
		resources/samples/VoiceRecognitionService "Voice Recognition Service"
		resources/samples/VoiceRecognitionService "Voice Recognition Service" \
		-samplecode $(sample_dir)/NFCDemo \
		resources/samples/NFCDemo "NFC Demo"

		## SDK version identifiers used in the published docs
		# major[.minor] version for current SDK. (full releases only)
		framework_docs_SDK_VERSION:=2.2
		framework_docs_SDK_VERSION:=2.3
		# release version (ie "Release x") (full releases only)
		framework_docs_SDK_REL_ID:=1
		# flag to build offline docs for a preview release

api/9.xml

+27 −27

Original line number	Diff line number	Diff line
		@@ -93863,7 +93863,7 @@
		type="android.net.SSLCertificateSocketFactory"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		<parameter name="handshakeTimeoutMillis" type="int">
		@@ -95963,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">
		@@ -96030,7 +96030,7 @@
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</method>
		@@ -96052,7 +96052,7 @@
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</method>
		@@ -172464,7 +172464,7 @@
		abstract="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		<constructor name="EventLogTags"
		@@ -202795,7 +202795,7 @@
		synchronized="true"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</method>
		@@ -203341,7 +203341,7 @@
		synchronized="true"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		<parameter name="flag" type="boolean">
		@@ -205466,7 +205466,7 @@
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		<parameter name="view" type="android.webkit.WebView">
		@@ -213999,7 +213999,7 @@
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</method>
		@@ -224573,7 +224573,7 @@
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="t" type="T">
		<parameter name="arg0" type="T">
		</parameter>
		</method>
		</interface>
		@@ -326646,7 +326646,7 @@
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="toCopyIn" type="E[]">
		<parameter name="array" type="E[]">
		</parameter>
		</constructor>
		<method name="add"
		@@ -326674,7 +326674,7 @@
		>
		<parameter name="index" type="int">
		</parameter>
		<parameter name="element" type="E">
		<parameter name="e" type="E">
		</parameter>
		</method>
		<method name="addAll"
		@@ -326802,7 +326802,9 @@
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="o" type="java.lang.Object">
		<parameter name="e" type="E">
		</parameter>
		<parameter name="index" type="int">
		</parameter>
		</method>
		<method name="indexOf"
		@@ -326815,9 +326817,7 @@
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="e" type="E">
		</parameter>
		<parameter name="index" type="int">
		<parameter name="o" type="java.lang.Object">
		</parameter>
		</method>
		<method name="isEmpty"
		@@ -326852,7 +326852,9 @@
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="o" type="java.lang.Object">
		<parameter name="e" type="E">
		</parameter>
		<parameter name="index" type="int">
		</parameter>
		</method>
		<method name="lastIndexOf"
		@@ -326865,9 +326867,7 @@
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="e" type="E">
		</parameter>
		<parameter name="index" type="int">
		<parameter name="o" type="java.lang.Object">
		</parameter>
		</method>
		<method name="listIterator"
		@@ -326958,7 +326958,7 @@
		>
		<parameter name="index" type="int">
		</parameter>
		<parameter name="element" type="E">
		<parameter name="e" type="E">
		</parameter>
		</method>
		<method name="size"
		@@ -411704,7 +411704,7 @@
		abstract="true"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		<method name="getLength"
		@@ -412193,7 +412193,7 @@
		abstract="true"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		<method name="characters"
		@@ -412408,7 +412408,7 @@
		abstract="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		<implements name="org.xml.sax.DTDHandler">
		@@ -412875,7 +412875,7 @@
		abstract="true"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		<method name="parse"
		@@ -414307,7 +414307,7 @@
		abstract="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		<implements name="org.xml.sax.AttributeList">
		@@ -415796,7 +415796,7 @@
		abstract="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		<method name="makeParser"

core/java/android/app/ContextImpl.java

+8 −3

Original line number	Diff line number	Diff line
		@@ -367,7 +367,8 @@ class ContextImpl extends Context {
		}

		Map map = null;
		if (prefsFile.exists() && prefsFile.canRead()) {
		FileStatus stat = new FileStatus();
		if (FileUtils.getFileStatus(prefsFile.getPath(), stat) && prefsFile.canRead()) {
		try {
		FileInputStream str = new FileInputStream(prefsFile);
		map = XmlUtils.readMapXml(str);
		@@ -380,7 +381,7 @@ class ContextImpl extends Context {
		Log.w(TAG, "getSharedPreferences", e);
		}
		}
		sp.replace(map);
		sp.replace(map, stat);
		}
		return sp;
		}
		@@ -2768,12 +2769,16 @@ class ContextImpl extends Context {
		}
		}

		public void replace(Map newContents) {
		/* package */ void replace(Map newContents, FileStatus stat) {
		synchronized (this) {
		mLoaded = true;
		if (newContents != null) {
		mMap = newContents;
		}
		if (stat != null) {
		mStatTimestamp = stat.mtime;
		mStatSize = stat.size;
		}
		}
		}

core/java/android/hardware/Camera.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -906,6 +906,7 @@ public class Camera {
		* Changes the settings for this Camera service.
		*
		* @param params the Parameters to use for this Camera service
		* @throws RuntimeException if any parameter is invalid or not supported.
		* @see #getParameters()
		*/
		public void setParameters(Parameters params) {

core/java/android/hardware/SensorEvent.java

+35 −13

Original line number	Diff line number	Diff line
		@@ -220,25 +220,47 @@ public class SensorEvent {
		* </p>
		*
		* <h4>{@link android.hardware.Sensor#TYPE_GRAVITY Sensor.TYPE_GRAVITY}:</h4>
		* A three dimensional vector indicating the direction and magnitude of gravity. Units
		* are m/s^2. The coordinate system is the same as is used by the acceleration sensor.
		* <p>A three dimensional vector indicating the direction and magnitude of gravity. Units
		* are m/s^2. The coordinate system is the same as is used by the acceleration sensor.</p>
		* <p><b>Note:</b> When the device is at rest, the output of the gravity sensor should be identical
		* to that of the accelerometer.</p>
		*
		* <h4>{@link android.hardware.Sensor#TYPE_LINEAR_ACCELERATION Sensor.TYPE_LINEAR_ACCELERATION}:</h4>
		* A three dimensional vector indicating acceleration along each device axis, not including
		* gravity. All values have units of m/s^2. The coordinate system is the same as is used by the
		* acceleration sensor.
		* <p>The output of the accelerometer, gravity and linear-acceleration sensors must obey the
		* following relation:</p>
		* <p><ul>acceleration = gravity + linear-acceleration</ul></p>
		*
		* <h4>{@link android.hardware.Sensor#TYPE_ROTATION_VECTOR Sensor.TYPE_ROTATION_VECTOR}:</h4>
		* The rotation vector represents the orientation of the device as a combination of an angle
		* and an axis, in which the device has rotated through an angle theta around an axis
		* <x, y, z>. The three elements of the rotation vector are
		* <xsin(theta/2), ysin(theta/2), z*sin(theta/2)>, such that the magnitude of the rotation
		* vector is equal to sin(theta/2), and the direction of the rotation vector is equal to the
		* direction of the axis of rotation. The three elements of the rotation vector are equal to
		* the last three components of a unit quaternion
		* <cos(theta/2), xsin(theta/2), ysin(theta/2), z*sin(theta/2)>. Elements of the rotation
		* vector are unitless. The x,y, and z axis are defined in the same way as the acceleration
		* sensor.
		* <p>The rotation vector represents the orientation of the device as a combination of an <i>angle</i>
		* and an <i>axis</i>, in which the device has rotated through an angle &#952 around an axis
		* <x, y, z>.</p>
		* <p>The three elements of the rotation vector are
		* <xsin(&#952/2), ysin(&#952/2), z*sin(&#952/2)>, such that the magnitude of the rotation
		* vector is equal to sin(&#952/2), and the direction of the rotation vector is equal to the
		* direction of the axis of rotation.</p>
		* </p>The three elements of the rotation vector are equal to
		* the last three components of a <b>unit</b> quaternion
		* <cos(&#952/2), xsin(&#952/2), ysin(&#952/2), z*sin(&#952/2)>.</p>
		* <p>Elements of the rotation vector are unitless.
		* The x,y, and z axis are defined in the same way as the acceleration
		* sensor.</p>
		* <ul>
		* <p>
		* values[0]: x*sin(&#952/2)
		* </p>
		* <p>
		* values[1]: y*sin(&#952/2)
		* </p>
		* <p>
		* values[2]: z*sin(&#952/2)
		* </p>
		* <p>
		* values[3]: cos(&#952/2) <i>(optional: only if value.length = 4)</i>
		* </p>
		* </ul>
		*
		* <h4>{@link android.hardware.Sensor#TYPE_ORIENTATION
		* Sensor.TYPE_ORIENTATION}:</h4> All values are angles in degrees.