Merge branch 'eclair' into eclair-release (b2e45d89) · Commits · e / os / android_frameworks_base

Android.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -439,6 +439,7 @@ LOCAL_MODULE := offline-sdk

		LOCAL_DROIDDOC_OPTIONS:=\
		$(framework_docs_LOCAL_DROIDDOC_OPTIONS) \
		$(web_docs_sample_code_flags) \
		-title "Android SDK" \
		-proofread $(OUT_DOCS)/$(LOCAL_MODULE)-proofread.txt \
		-todo $(OUT_DOCS)/$(LOCAL_MODULE)-docs-todo.html \

api/current.xml

+110 −65

Original line number	Diff line number	Diff line
		@@ -15058,71 +15058,6 @@
		>
		</method>
		</interface>
		<class name="AccountManagerResponse"
		extends="java.lang.Object"
		abstract="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<implements name="android.os.Parcelable">
		</implements>
		<method name="describeContents"
		return="int"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</method>
		<method name="onError"
		return="void"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="errorCode" type="int">
		</parameter>
		<parameter name="errorMessage" type="java.lang.String">
		</parameter>
		</method>
		<method name="onResult"
		return="void"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="result" type="android.os.Bundle">
		</parameter>
		</method>
		<method name="writeToParcel"
		return="void"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="dest" type="android.os.Parcel">
		</parameter>
		<parameter name="flags" type="int">
		</parameter>
		</method>
		</class>
		<class name="AccountsException"
		extends="java.lang.Exception"
		abstract="false"
		@@ -42057,6 +41992,116 @@
		visibility="public"
		>
		</field>
		<field name="FEATURE_CAMERA"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""android.hardware.camera""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="FEATURE_CAMERA_AUTOFOCUS"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""android.hardware.camera.autofocus""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="FEATURE_CAMERA_FLASH"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""android.hardware.camera.flash""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="FEATURE_LIVE_WALLPAPER"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""android.software.live_wallpaper""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="FEATURE_SENSOR_LIGHT"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""android.hardware.sensor.light""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="FEATURE_SENSOR_PROXIMITY"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""android.hardware.sensor.proximity""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="FEATURE_TELEPHONY"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""android.hardware.telephony""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="FEATURE_TELEPHONY_CDMA"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""android.hardware.telephony.cdma""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="FEATURE_TELEPHONY_GSM"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""android.hardware.telephony.gsm""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="FEATURE_TOUCHSCREEN_MULTITOUCH"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""android.hardware.touchscreen.multitouch""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="GET_ACTIVITIES"
		type="int"
		transient="false"

cmds/dumpstate/dumpstate.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -84,6 +84,8 @@ static void dumpstate(int full) {
		EXEC("dmesg");
		PRINT("------ KERNEL WAKELOCKS ------");
		DUMP("/proc/wakelocks");
		PRINT("------ KERNEL CPUFREQ ------");
		DUMP("/sys/devices/system/cpu/cpu0/cpufreq/stats/time_in_state");
		PRINT("");
		PRINT("------ PROCESSES ------");
		EXEC1("ps", "-P");

core/java/android/accounts/AccountManagerResponse.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -22,7 +22,8 @@ import android.os.Parcelable;
		import android.os.RemoteException;

		/**
		* Used by Account Authenticators to return a response.
		* Used to return a response to the AccountManager.
		* @hide
		*/
		public class AccountManagerResponse implements Parcelable {
		private IAccountManagerResponse mResponse;

core/java/android/bluetooth/BluetoothAdapter.java

+16 −5

Original line number	Diff line number	Diff line
		@@ -130,13 +130,13 @@ public final class BluetoothAdapter {

		/**
		* Activity Action: Show a system activity that requests discoverable mode.
		* <p>This activity will also request the user to turn on Bluetooth if it
		* This activity will also request the user to turn on Bluetooth if it
		* is not currently enabled.
		* <p>Discoverable mode is equivalent to {@link
		* #SCAN_MODE_CONNECTABLE_DISCOVERABLE}. It allows remote devices to see
		* this Bluetooth adapter when they perform a discovery.
		* <p>For privacy, Android is not by default discoverable.
		* <p>The sender can optionally use extra field {@link
		* <p>For privacy, Android is not discoverable by default.
		* <p>The sender of this Intent can optionally use extra field {@link
		* #EXTRA_DISCOVERABLE_DURATION} to request the duration of
		* discoverability. Currently the default duration is 120 seconds, and
		* maximum duration is capped at 300 seconds for each request.
		@@ -147,7 +147,8 @@ public final class BluetoothAdapter {
		* {@link android.app.Activity#RESULT_CANCELED} if the user rejected
		* discoverability or an error has occurred.
		* <p>Applications can also listen for {@link #ACTION_SCAN_MODE_CHANGED}
		* for global notification whenever the scan mode changes.
		* for global notification whenever the scan mode changes. For example, an
		* application can be notified when the device has ended discoverability.
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH}
		*/
		@SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
		@@ -549,7 +550,10 @@ public final class BluetoothAdapter {
		* remote Bluetooth devices should not be attempted while discovery is in
		* progress, and existing connections will experience limited bandwidth
		* and high latency. Use {@link #cancelDiscovery()} to cancel an ongoing
		* discovery.
		* discovery. Discovery is not managed by the Activity,
		* but is run as a system service, so an application should always call
		* {@link BluetoothAdapter#cancelDiscovery()} even if it
		* did not directly request a discovery, just to be sure.
		* <p>Device discovery will only find remote devices that are currently
		* <i>discoverable</i> (inquiry scan enabled). Many Bluetooth devices are
		* not discoverable by default, and need to be entered into a special mode.
		@@ -567,6 +571,13 @@ public final class BluetoothAdapter {
		/**
		* Cancel the current device discovery process.
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH_ADMIN}.
		* <p>Because discovery is a heavyweight precedure for the Bluetooth
		* adapter, this method should always be called before attempting to connect
		* to a remote device with {@link
		* android.bluetooth.BluetoothSocket#connect()}. Discovery is not managed by
		* the Activity, but is run as a system service, so an application should
		* always call cancel discovery even if it did not directly request a
		* discovery, just to be sure.
		*
		* @return true on success, false on error
		*/