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

Commit 34ca22d2 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 26366 into eclair 

* changes:
  Set the bonding for incoming connections only when authentication is requested.
parents 6c644f24 7633b894

core/java/android/server/BluetoothEventLoop.java

+3 −1
Original line number Diff line number Diff line
@@ -247,7 +247,6 @@ class BluetoothEventLoop { 
                addDevice(address, properties);

            }

        }

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

        return;

    }
@@ -404,6 +403,9 @@ class BluetoothEventLoop { 
            mBluetoothService.cancelPairingUserInput(address);

            return null;

        }

        // Set state to BONDING, for incoming connections it will be set here.

        // For outgoing connections, it gets set when call createBond.

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

        return address;

    }