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

am 302afb93: Merge "Call notifyIncomingA2dpConnection with correct rejected status" into ics-mr1

Browse Source 
* commit '302afb93d4fd908949ac796eda8343f9683e616a':
  Call notifyIncomingA2dpConnection with correct rejected status
This commit is contained in:
Matthew Xie
2011-11-16 18:25:04 -08:00
committed by Android Git Automerger
parent f14ce7db5d 302afb93d4
commit 37fb92fb63
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/server/BluetoothEventLoop.java
View File

@@ -784,12 +784,12 @@ class BluetoothEventLoop {
// machine. We don't handle AVCTP signals currently. We only send
// intents for AVDTP state changes. We need to handle both of them in
// some cases. For now, just don't move to incoming state in this case.
mBluetoothService.notifyIncomingA2dpConnection(address, true);
mBluetoothService.notifyIncomingA2dpConnection(address, false);
} else {
Log.i(TAG, "" + authorized +
"Incoming A2DP / AVRCP connection from " + address);
mA2dp.allowIncomingConnect(device, authorized);
mBluetoothService.notifyIncomingA2dpConnection(address, false);
mBluetoothService.notifyIncomingA2dpConnection(address, true);
}
} else if (BluetoothUuid.isInputDevice(uuid)) {
// We can have more than 1 input device connected.