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

Commit ccb27ce5 authored by Jakub Pawlowski's avatar Jakub Pawlowski
Browse files

BatteryService: don't use autoconnect with opportunistic connections 

Opportunistic connections were meant to be used with autoConenct set to
false. Currently this code would keep, and create connections to
devices, which is not intended behavior - it should just use connections
when they are present.

Test: 1. connect to hid device with battery level monitor.
      2. select "disconnect in BT settings for this device.
      3. press any key, and verify device does not reconnect.
Change-Id: Ia35d830ed09c5ec8bbeb91ec97bf8abb9690b116
parent 3272d97d

android/app/src/com/android/bluetooth/bas/BatteryStateMachine.java

+3 −4
Original line number Diff line number Diff line
@@ -223,14 +223,13 @@ public class BatteryStateMachine extends StateMachine { 
            return false;

        }



        if (mBluetoothGatt != null) {

            mBluetoothGatt.connect();

        } else {

        if (mBluetoothGatt == null) {

            mGattCallback = new GattCallback();

            mBluetoothGatt = mDevice.connectGatt(service, /*autoConnect=*/true,

            mBluetoothGatt = mDevice.connectGatt(service, /*autoConnect=*/false,

                    mGattCallback, TRANSPORT_AUTO, /*opportunistic=*/true,

                    PHY_LE_1M_MASK | PHY_LE_2M_MASK, getHandler());

        }

        // opportunistic client will reconnect itself, no need to call mBluetoothGatt.connect()

        return mBluetoothGatt != null;

    }