Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 4fe6f603: am 718970bc: Merge change 26061 into eclair

Browse Source 
Merge commit '4fe6f603cafd2f1b54051809182c308a4077b783'

* commit '4fe6f603cafd2f1b54051809182c308a4077b783':
  Send the UUID intent even if apps have not requested for it.
This commit is contained in:
Jaikumar Ganesh
2009-09-20 17:51:57 -07:00
committed by Android Git Automerger
parent 40dedc6a54 4fe6f603ca
commit f751881fdb
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/server/BluetoothService.java
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