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

api/current.xml

+237 −0

Original line number	Diff line number	Diff line
		@@ -34021,6 +34021,17 @@
		<parameter name="defaultValue" type="short">
		</parameter>
		</method>
		<method name="getSourceBounds"
		return="android.graphics.Rect"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</method>
		<method name="getStringArrayExtra"
		return="java.lang.String[]"
		abstract="false"
		@@ -34832,6 +34843,19 @@
		<parameter name="packageName" type="java.lang.String">
		</parameter>
		</method>
		<method name="setSourceBounds"
		return="void"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="r" type="android.graphics.Rect">
		</parameter>
		</method>
		<method name="setType"
		return="android.content.Intent"
		abstract="false"
		@@ -36412,6 +36436,17 @@
		visibility="public"
		>
		</field>
		<field name="FILL_IN_SOURCE_BOUNDS"
		type="int"
		transient="false"
		volatile="false"
		value="32"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="FLAG_ACTIVITY_BROUGHT_TO_FRONT"
		type="int"
		transient="false"
		@@ -62074,6 +62109,17 @@
		visibility="public"
		>
		</method>
		<method name="flattenToString"
		return="java.lang.String"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</method>
		<method name="height"
		return="int"
		abstract="false"
		@@ -62300,6 +62346,19 @@
		visibility="public"
		>
		</method>
		<method name="unflattenFromString"
		return="android.graphics.Rect"
		abstract="false"
		native="false"
		synchronized="false"
		static="true"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="str" type="java.lang.String">
		</parameter>
		</method>
		<method name="union"
		return="void"
		abstract="false"
		@@ -124750,6 +124809,20 @@
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="rssi" type="int">
		</parameter>
		<parameter name="location" type="java.lang.String">
		</parameter>
		<parameter name="radioType" type="int">
		</parameter>
		</constructor>
		<constructor name="NeighboringCellInfo"
		type="android.telephony.NeighboringCellInfo"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="in" type="android.os.Parcel">
		</parameter>
		</constructor>
		@@ -125561,6 +125634,21 @@
		<parameter name="state" type="int">
		</parameter>
		</method>
		<method name="onDataConnectionStateChanged"
		return="void"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="state" type="int">
		</parameter>
		<parameter name="networkType" type="int">
		</parameter>
		</method>
		<method name="onMessageWaitingIndicatorChanged"
		return="void"
		abstract="false"
		@@ -125600,6 +125688,19 @@
		<parameter name="asu" type="int">
		</parameter>
		</method>
		<method name="onSignalStrengthsChanged"
		return="void"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="signalStrength" type="android.telephony.SignalStrength">
		</parameter>
		</method>
		<field name="LISTEN_CALL_FORWARDING_INDICATOR"
		type="int"
		transient="false"
		@@ -125695,6 +125796,17 @@
		value="2"
		static="true"
		final="true"
		deprecated="deprecated"
		visibility="public"
		>
		</field>
		<field name="LISTEN_SIGNAL_STRENGTHS"
		type="int"
		transient="false"
		volatile="false"
		value="256"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		@@ -125976,6 +126088,131 @@
		>
		</field>
		</class>
		<class name="SignalStrength"
		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="getCdmaDbm"
		return="int"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</method>
		<method name="getCdmaEcio"
		return="int"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</method>
		<method name="getEvdoDbm"
		return="int"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</method>
		<method name="getEvdoEcio"
		return="int"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</method>
		<method name="getEvdoSnr"
		return="int"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</method>
		<method name="getGsmBitErrorRate"
		return="int"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</method>
		<method name="getGsmSignalStrength"
		return="int"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</method>
		<method name="isGsm"
		return="boolean"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</method>
		<method name="writeToParcel"
		return="void"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="out" type="android.os.Parcel">
		</parameter>
		<parameter name="flags" type="int">
		</parameter>
		</method>
		</class>
		<class name="SmsManager"
		extends="java.lang.Object"
		abstract="false"

core/java/android/bluetooth/BluetoothA2dp.java

+5 −2

Original line number	Diff line number	Diff line
		@@ -74,9 +74,12 @@ public final class BluetoothA2dp {
		/** Playing implies connected */
		public static final int STATE_PLAYING = 4;

		/** Default priority for a2dp devices that we try to auto-connect
		* and allow incoming connections */
		public static final int PRIORITY_AUTO_CONNECT = 1000;
		/** Default priority for a2dp devices that should allow incoming
		* connections */
		public static final int PRIORITY_AUTO = 100;
		public static final int PRIORITY_ON = 100;
		/** Default priority for a2dp devices that should not allow incoming
		* connections */
		public static final int PRIORITY_OFF = 0;

core/java/android/bluetooth/BluetoothHeadset.java

+8 −3

Original line number	Diff line number	Diff line
		@@ -100,9 +100,14 @@ public final class BluetoothHeadset {
		/** Connection canceled before completetion. */
		public static final int RESULT_CANCELED = 2;

		/** Default priority for headsets that should be auto-connected */
		public static final int PRIORITY_AUTO = 100;
		/** Default priority for headsets that should not be auto-connected */
		/** Default priority for headsets that for which we will accept
		* inconing connections and auto-connect */
		public static final int PRIORITY_AUTO_CONNECT = 1000;
		/** Default priority for headsets that for which we will accept
		* inconing connections but not auto-connect */
		public static final int PRIORITY_ON = 100;
		/** Default priority for headsets that should not be auto-connected
		* and not allow incoming connections. */
		public static final int PRIORITY_OFF = 0;

		/** The voice dialer 'works' but the user experience is poor. The voice

core/java/android/content/Intent.java

+68 −1

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@ import android.content.pm.PackageManager;
		import android.content.pm.ResolveInfo;
		import android.content.res.Resources;
		import android.content.res.TypedArray;
		import android.graphics.Rect;
		import android.net.Uri;
		import android.os.Bundle;
		import android.os.IBinder;
		@@ -2417,6 +2418,7 @@ public class Intent implements Parcelable {
		private int mFlags;
		private HashSet<String> mCategories;
		private Bundle mExtras;
		private Rect mSourceBounds;

		// ---------------------------------------------------------------------

		@@ -2442,6 +2444,9 @@ public class Intent implements Parcelable {
		if (o.mExtras != null) {
		this.mExtras = new Bundle(o.mExtras);
		}
		if (o.mSourceBounds != null) {
		this.mSourceBounds = new Rect(o.mSourceBounds);
		}
		}

		@Override
		@@ -2655,6 +2660,11 @@ public class Intent implements Parcelable {
		scheme = value;
		}

		// source bounds
		else if (uri.startsWith("sourceBounds=", i)) {
		intent.mSourceBounds = Rect.unflattenFromString(value);
		}

		// extra
		else {
		String key = Uri.decode(uri.substring(i + 2, eq));
		@@ -3546,6 +3556,15 @@ public class Intent implements Parcelable {
		return mComponent;
		}

		/**
		* Get the bounds of the sender of this intent, in screen coordinates. This can be
		* used as a hint to the receiver for animations and the like. Null means that there
		* is no source bounds.
		*/
		public Rect getSourceBounds() {
		return mSourceBounds;
		}

		/**
		* Return the Activity component that should be used to handle this intent.
		* The appropriate component is determined based on the information in the
		@@ -4647,6 +4666,19 @@ public class Intent implements Parcelable {
		return this;
		}

		/**
		* Set the bounds of the sender of this intent, in screen coordinates. This can be
		* used as a hint to the receiver for animations and the like. Null means that there
		* is no source bounds.
		*/
		public void setSourceBounds(Rect r) {
		if (r != null) {
		mSourceBounds = new Rect(r);
		} else {
		r = null;
		}
		}

		/**
		* Use with {@link #fillIn} to allow the current action value to be
		* overwritten, even if it is already set.
		@@ -4677,6 +4709,12 @@ public class Intent implements Parcelable {
		*/
		public static final int FILL_IN_PACKAGE = 1<<4;

		/**
		* Use with {@link #fillIn} to allow the current package value to be
		* overwritten, even if it is already set.
		*/
		public static final int FILL_IN_SOURCE_BOUNDS = 1<<5;

		/**
		* Copy the contents of <var>other</var> in to this object, but only
		* where fields are not defined by this object. For purposes of a field
		@@ -4691,6 +4729,7 @@ public class Intent implements Parcelable {
		* <li> package, as set by {@link #setPackage}.
		* <li> component, as set by {@link #setComponent(ComponentName)} or
		* related methods.
		* <li> source bounds, as set by {@link #setSourceBounds}
		* <li> each top-level name in the associated extras.
		* </ul>
		*
		@@ -4752,6 +4791,11 @@ public class Intent implements Parcelable {
		changes \|= FILL_IN_COMPONENT;
		}
		mFlags \|= other.mFlags;
		if (other.mSourceBounds != null
		&& (mSourceBounds == null \|\| (flags&FILL_IN_SOURCE_BOUNDS) != 0)) {
		mSourceBounds = new Rect(other.mSourceBounds);
		changes \|= FILL_IN_SOURCE_BOUNDS;
		}
		if (mExtras == null) {
		if (other.mExtras != null) {
		mExtras = new Bundle(other.mExtras);
		@@ -5005,6 +5049,13 @@ public class Intent implements Parcelable {
		first = false;
		b.append("cmp=").append(mComponent.flattenToShortString());
		}
		if (mSourceBounds != null) {
		if (!first) {
		b.append(' ');
		}
		first = false;
		b.append("bnds=").append(mSourceBounds.toShortString());
		}
		if (extras && mExtras != null) {
		if (!first) {
		b.append(' ');
		@@ -5096,6 +5147,11 @@ public class Intent implements Parcelable {
		uri.append("component=").append(Uri.encode(
		mComponent.flattenToShortString(), "/")).append(';');
		}
		if (mSourceBounds != null) {
		uri.append("sourceBounds=")
		.append(Uri.encode(mSourceBounds.flattenToString()))
		.append(';');
		}
		if (mExtras != null) {
		for (String key : mExtras.keySet()) {
		final Object value = mExtras.get(key);
		@@ -5139,6 +5195,13 @@ public class Intent implements Parcelable {
		out.writeString(mPackage);
		ComponentName.writeToParcel(mComponent, out);

		if (mSourceBounds != null) {
		out.writeInt(1);
		mSourceBounds.writeToParcel(out, flags);
		} else {
		out.writeInt(0);
		}

		if (mCategories != null) {
		out.writeInt(mCategories.size());
		for (String category : mCategories) {
		@@ -5174,6 +5237,10 @@ public class Intent implements Parcelable {
		mPackage = in.readString();
		mComponent = ComponentName.readFromParcel(in);

		if (in.readInt() != 0) {
		mSourceBounds = Rect.CREATOR.createFromParcel(in);
		}

		int N = in.readInt();
		if (N > 0) {
		mCategories = new HashSet<String>();

core/java/android/hardware/Camera.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -477,6 +477,10 @@ public class Camera {
		* application does not need a particular callback, a null can be passed
		* instead of a callback method.
		*
		* This method will stop the preview. Applications should not call {@link
		* #stopPreview()} before this. After jpeg callback is received,
		* applications can call {@link #startPreview()} to restart the preview.
		*
		* @param shutter callback after the image is captured, may be null
		* @param raw callback with raw image data, may be null
		* @param jpeg callback with jpeg image data, may be null
		@@ -500,6 +504,10 @@ public class Camera {
		* application does not need a particular callback, a null can be passed
		* instead of a callback method.
		*
		* This method will stop the preview. Applications should not call {@link
		* #stopPreview()} before this. After jpeg callback is received,
		* applications can call {@link #startPreview()} to restart the preview.
		*
		* @param shutter callback after the image is captured, may be null
		* @param raw callback with raw image data, may be null
		* @param postview callback with postview image data, may be null