diff options
| author | Ed Heyl <ed@google.com> | 2011-11-08 05:58:37 -0800 |
|---|---|---|
| committer | Ed Heyl <ed@google.com> | 2011-11-08 05:58:37 -0800 |
| commit | 9d6a51623fdabbe993d7b8848794607394ef7cc2 (patch) | |
| tree | 1d4a9b169126feea3e57026e04f2a1b65e175a22 /core/java/android/bluetooth | |
| parent | 98f5500c71754dad428e00d569007e0b98dc8aee (diff) | |
| download | frameworks_base-9d6a51623fdabbe993d7b8848794607394ef7cc2.zip frameworks_base-9d6a51623fdabbe993d7b8848794607394ef7cc2.tar.gz frameworks_base-9d6a51623fdabbe993d7b8848794607394ef7cc2.tar.bz2 | |
Fix build break; Revert "Make public APIs of ACTION_UUID, getUuids, and fetchUuidsWithSdp"
This reverts commit ae5839dcad76625313e6736d69eeaf37af435a3f.
Diffstat (limited to 'core/java/android/bluetooth')
| -rw-r--r-- | core/java/android/bluetooth/BluetoothDevice.java | 35 |
1 files changed, 12 insertions, 23 deletions
diff --git a/core/java/android/bluetooth/BluetoothDevice.java b/core/java/android/bluetooth/BluetoothDevice.java index e8c368c..4cb8220 100644 --- a/core/java/android/bluetooth/BluetoothDevice.java +++ b/core/java/android/bluetooth/BluetoothDevice.java @@ -249,10 +249,11 @@ public final class BluetoothDevice implements Parcelable { * <p> Always contains the extra field {@link #EXTRA_DEVICE} * <p> Always contains the extra filed {@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.bluetooth.device.action.UUID"; + "android.bleutooth.device.action.UUID"; /** * Broadcast Action: Indicates a failure to retrieve the name of a remote @@ -769,18 +770,7 @@ public final class BluetoothDevice implements Parcelable { return false; } - /** - * 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 - */ + /** @hide */ public ParcelUuid[] getUuids() { try { return sService.getRemoteUuids(mAddress); @@ -789,19 +779,18 @@ public final class BluetoothDevice implements Parcelable { } /** - * 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, - * {@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}. + * Perform a SDP query on the remote device to get the UUIDs + * supported. This API is asynchronous and an 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. * - * @return False if the sanity check fails, True if the process + * @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 { |
