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

Commit 9395b465 authored by Jaikumar Ganesh's avatar Jaikumar Ganesh Committed by Android (Google) Code Review
Browse files

Merge "Fix to get A2DP to connect after unpairing" into gingerbread

parents f3de053c 4226415b

core/java/android/server/BluetoothEventLoop.java

+7 −1
Original line number Diff line number Diff line
@@ -404,7 +404,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);