Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 37fb92fb authored by Matthew Xie's avatar Matthew Xie Committed by Android Git Automerger
Browse files

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

* commit '302afb93':
  Call notifyIncomingA2dpConnection with correct rejected status
parents f14ce7db 302afb93

core/java/android/server/BluetoothEventLoop.java

+2 −2
Original line number Diff line number Diff line
@@ -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.