Merge "Make public APIs of ACTION_UUID, EXTRA_UUID, getUuids, and fetchUuidsWithSdp" into ics-mr1 (48542eb3) · Commits · e / os / android_frameworks_base

api/current.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -4475,10 +4475,12 @@ package android.bluetooth {
		method public android.bluetooth.BluetoothSocket createInsecureRfcommSocketToServiceRecord(java.util.UUID) throws java.io.IOException;
		method public android.bluetooth.BluetoothSocket createRfcommSocketToServiceRecord(java.util.UUID) throws java.io.IOException;
		method public int describeContents();
		method public boolean fetchUuidsWithSdp();
		method public java.lang.String getAddress();
		method public android.bluetooth.BluetoothClass getBluetoothClass();
		method public int getBondState();
		method public java.lang.String getName();
		method public android.os.ParcelUuid[] getUuids();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final java.lang.String ACTION_ACL_CONNECTED = "android.bluetooth.device.action.ACL_CONNECTED";
		field public static final java.lang.String ACTION_ACL_DISCONNECTED = "android.bluetooth.device.action.ACL_DISCONNECTED";
		@@ -4487,6 +4489,7 @@ package android.bluetooth {
		field public static final java.lang.String ACTION_CLASS_CHANGED = "android.bluetooth.device.action.CLASS_CHANGED";
		field public static final java.lang.String ACTION_FOUND = "android.bluetooth.device.action.FOUND";
		field public static final java.lang.String ACTION_NAME_CHANGED = "android.bluetooth.device.action.NAME_CHANGED";
		field public static final java.lang.String ACTION_UUID = "android.bluetooth.device.action.UUID";
		field public static final int BOND_BONDED = 12; // 0xc
		field public static final int BOND_BONDING = 11; // 0xb
		field public static final int BOND_NONE = 10; // 0xa
		@@ -4498,6 +4501,7 @@ package android.bluetooth {
		field public static final java.lang.String EXTRA_NAME = "android.bluetooth.device.extra.NAME";
		field public static final java.lang.String EXTRA_PREVIOUS_BOND_STATE = "android.bluetooth.device.extra.PREVIOUS_BOND_STATE";
		field public static final java.lang.String EXTRA_RSSI = "android.bluetooth.device.extra.RSSI";
		field public static final java.lang.String EXTRA_UUID = "android.bluetooth.device.extra.UUID";
		}

		public final class BluetoothHeadset implements android.bluetooth.BluetoothProfile {

core/java/android/bluetooth/BluetoothDevice.java

+24 −14

Original line number	Diff line number	Diff line
		@@ -247,13 +247,12 @@ public final class BluetoothDevice implements Parcelable {
		* has been fetched. This intent is sent only when the UUIDs of the remote
		* device are requested to be fetched using Service Discovery Protocol
		* <p> Always contains the extra field {@link #EXTRA_DEVICE}
		* <p> Always contains the extra filed {@link #EXTRA_UUID}
		* <p> Always contains the extra field {@link #EXTRA_UUID}
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH} to receive.
		* @hide
		*/
		@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
		public static final String ACTION_UUID =
		"android.bleutooth.device.action.UUID";
		"android.bluetooth.device.action.UUID";

		/**
		* Broadcast Action: Indicates a failure to retrieve the name of a remote
		@@ -451,7 +450,6 @@ public final class BluetoothDevice implements Parcelable {
		* Used as an extra field in {@link #ACTION_UUID} intents,
		* Contains the {@link android.os.ParcelUuid}s of the remote device which
		* is a parcelable version of {@link UUID}.
		* @hide
		*/
		public static final String EXTRA_UUID = "android.bluetooth.device.extra.UUID";

		@@ -770,7 +768,18 @@ public final class BluetoothDevice implements Parcelable {
		return false;
		}

		/** @hide */
		/**
		* Returns the supported features (UUIDs) of the remote device.
		*
		* <p>This method does not start a service discovery procedure to retrieve the UUIDs
		* from the remote device. Instead, the local cached copy of the service
		* UUIDs are returned.
		* <p>Use {@link #fetchUuidsWithSdp} if fresh UUIDs are desired.
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH}.
		*
		* @return the supported features (UUIDs) of the remote device,
		* or null on error
		*/
		public ParcelUuid[] getUuids() {
		try {
		return sService.getRemoteUuids(mAddress);
		@@ -779,18 +788,19 @@ public final class BluetoothDevice implements Parcelable {
		}

		/**
		* Perform a SDP query on the remote device to get the UUIDs
		* supported. This API is asynchronous and an Intent is sent,
		* Perform a service discovery on the remote device to get the UUIDs supported.
		*
		* <p>This API is asynchronous and {@link #ACTION_UUID} intent is sent,
		* with the UUIDs supported by the remote end. If there is an error
		* in getting the SDP records or if the process takes a long time,
		* an Intent is sent with the UUIDs that is currently present in the
		* cache. Clients should use the {@link #getUuids} to get UUIDs
		* is SDP is not to be performed.
		* {@link #ACTION_UUID} intent is sent with the UUIDs that is currently
		* present in the cache. Clients should use the {@link #getUuids} to get UUIDs
		* if service discovery is not to be performed.
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH}.
		*
		* @return False if the sanity check fails, True if the process
		* of initiating an ACL connection to the remote device
		* was started.
		* @hide
		*/
		public boolean fetchUuidsWithSdp() {
		try {