summaryrefslogtreecommitdiffstats
path: root/core/java/android/server/BluetoothEventLoop.java
diff options
context:
space:
mode:
authorJaikumar Ganesh <jaikumar@google.com>2009-09-20 12:56:21 -0700
committerJaikumar Ganesh <jaikumar@google.com>2009-09-20 16:16:08 -0700
commit2092361d586a20190c9137fb3cc9434cdc9ec99f (patch)
tree92ceea0c02c100435a95d9a01fad0f34ba4f4824 /core/java/android/server/BluetoothEventLoop.java
parentcc7f40a88d64cbb4e664e231668ae4e2862036c6 (diff)
downloadframeworks_base-2092361d586a20190c9137fb3cc9434cdc9ec99f.zip
frameworks_base-2092361d586a20190c9137fb3cc9434cdc9ec99f.tar.gz
frameworks_base-2092361d586a20190c9137fb3cc9434cdc9ec99f.tar.bz2
Maintain pending outgoing bonding address.
This helps us to distinguish between incoming and outgoing Bonding requests. Change-Id: I69e6a269b7dd6aad60e6f5711cad812291a7d313
Diffstat (limited to 'core/java/android/server/BluetoothEventLoop.java')
-rw-r--r--core/java/android/server/BluetoothEventLoop.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/server/BluetoothEventLoop.java b/core/java/android/server/BluetoothEventLoop.java
index 84c11e6..34921f4 100644
--- a/core/java/android/server/BluetoothEventLoop.java
+++ b/core/java/android/server/BluetoothEventLoop.java
@@ -457,8 +457,9 @@ class BluetoothEventLoop {
String address = checkPairingRequestAndGetAddress(objectPath, nativeData);
if (address == null) return;
- if (mBluetoothService.getBondState().getBondState(address) ==
- BluetoothDevice.BOND_BONDING) {
+ String pendingOutgoingAddress =
+ mBluetoothService.getBondState().getPendingOutgoingBonding();
+ if (address.equals(pendingOutgoingAddress)) {
// we initiated the bonding
BluetoothClass btClass = new BluetoothClass(mBluetoothService.getRemoteClass(address));