summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorJaikumar Ganesh <jaikumar@google.com>2009-09-21 17:10:46 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2009-09-21 17:10:46 -0700
commit0bee99f074b848a4fbe5138f4a6a200d6284f78b (patch)
tree78c001564a018065429f0821754f99cbd3738fb3 /core/java
parent374fd5a148213dd269a54ea9e1745a3b95b6d933 (diff)
parent9197081f8feca110455740874e06e05771f462c8 (diff)
downloadframeworks_base-0bee99f074b848a4fbe5138f4a6a200d6284f78b.zip
frameworks_base-0bee99f074b848a4fbe5138f4a6a200d6284f78b.tar.gz
frameworks_base-0bee99f074b848a4fbe5138f4a6a200d6284f78b.tar.bz2
am 9197081f: Merge change 26275 into eclair
Merge commit '9197081f8feca110455740874e06e05771f462c8' into eclair-plus-aosp * commit '9197081f8feca110455740874e06e05771f462c8': Send the address of the device with the UUID intent.
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/server/BluetoothService.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/server/BluetoothService.java b/core/java/android/server/BluetoothService.java
index 253b1ab..e5b20bd 100644
--- a/core/java/android/server/BluetoothService.java
+++ b/core/java/android/server/BluetoothService.java
@@ -1238,6 +1238,7 @@ public class BluetoothService extends IBluetooth.Stub {
/*package*/ synchronized void sendUuidIntent(String address) {
ParcelUuid[] uuid = getUuidFromCache(address);
Intent intent = new Intent(BluetoothDevice.ACTION_UUID);
+ intent.putExtra(BluetoothDevice.EXTRA_DEVICE, mAdapter.getRemoteDevice(address));
intent.putExtra(BluetoothDevice.EXTRA_UUID, uuid);
mContext.sendBroadcast(intent, BLUETOOTH_ADMIN_PERM);