diff options
| author | Matthew Xie <mattx@google.com> | 2011-11-16 18:20:50 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-11-16 18:20:50 -0800 |
| commit | 302afb93d4fd908949ac796eda8343f9683e616a (patch) | |
| tree | 20c1b2b80b52ea641f43df83f6e2a25543b9d45a | |
| parent | 1125f89e47b06b12a0e047d64f1ef953d0c48489 (diff) | |
| parent | 0901e601b53b79e5ff37d9aed7acd4291a6ce9dc (diff) | |
| download | frameworks_base-302afb93d4fd908949ac796eda8343f9683e616a.zip frameworks_base-302afb93d4fd908949ac796eda8343f9683e616a.tar.gz frameworks_base-302afb93d4fd908949ac796eda8343f9683e616a.tar.bz2 | |
Merge "Call notifyIncomingA2dpConnection with correct rejected status" into ics-mr1
| -rw-r--r-- | core/java/android/server/BluetoothEventLoop.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/server/BluetoothEventLoop.java b/core/java/android/server/BluetoothEventLoop.java index aa62cd7..a2038c9 100644 --- a/core/java/android/server/BluetoothEventLoop.java +++ b/core/java/android/server/BluetoothEventLoop.java @@ -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. |