Merge change 26061 into eclair

* changes:
  Send the UUID intent even if apps have not requested for it.
This commit is contained in:
Android (Google) Code Review
2009-09-20 20:36:54 -04:00

View File

@@ -1192,14 +1192,13 @@ public class BluetoothService extends IBluetooth.Stub {
/* Broadcast the Uuid intent */
/*package*/ synchronized void sendUuidIntent(String address) {
if (mUuidIntentTracker.contains(address)) {
ParcelUuid[] uuid = getUuidFromCache(address);
Intent intent = new Intent(BluetoothDevice.ACTION_UUID);
intent.putExtra(BluetoothDevice.EXTRA_UUID, uuid);
mContext.sendBroadcast(intent, BLUETOOTH_ADMIN_PERM);
ParcelUuid[] uuid = getUuidFromCache(address);
Intent intent = new Intent(BluetoothDevice.ACTION_UUID);
intent.putExtra(BluetoothDevice.EXTRA_UUID, uuid);
mContext.sendBroadcast(intent, BLUETOOTH_ADMIN_PERM);
if (mUuidIntentTracker.contains(address))
mUuidIntentTracker.remove(address);
}
}
@Override