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

Commit 293de3ea authored by Jaikumar Ganesh's avatar Jaikumar Ganesh Committed by Android Git Automerger
Browse files

am 049912b7: am 9395b465: Merge "Fix to get A2DP to connect after unpairing" into gingerbread 

Merge commit '049912b7'

* commit '049912b7':
  Fix to get A2DP to connect after unpairing
parents f6b81540 049912b7

core/java/android/server/BluetoothEventLoop.java

+7 −1
Original line number Diff line number Diff line
@@ -417,7 +417,13 @@ class BluetoothEventLoop { 
            mBluetoothService.sendUuidIntent(address);

        } else if (name.equals("Paired")) {

            if (propValues[1].equals("true")) {

                mBluetoothService.getBondState().setBondState(address, BluetoothDevice.BOND_BONDED);

                // If locally initiated pairing, we will

                // not go to BOND_BONDED state until we have received a

                // successful return value in onCreatePairedDeviceResult

                if (null == mBluetoothService.getBondState().getPendingOutgoingBonding()) {

                    mBluetoothService.getBondState().setBondState(address,

                            BluetoothDevice.BOND_BONDED);

                }

            } else {

                mBluetoothService.getBondState().setBondState(address,

                        BluetoothDevice.BOND_NONE);