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

Commit 87e3e7e1 authored by Kyunglyul Hyun's avatar Kyunglyul Hyun Committed by Automerger Merge Worker
Browse files

Merge "BAS: connect gatt service when device is reconnected" into tm-dev am:... 

Merge "BAS: connect gatt service when device is reconnected" into tm-dev am: fa1155b8 am: 48b9b803

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/18349804



Change-Id: Ic69f3509e4595e35aba2cc8c1d713a313fe43578
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 21e8b420 48b9b803

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

+2 −1
Original line number Diff line number Diff line
@@ -228,8 +228,9 @@ public class BatteryStateMachine extends StateMachine { 
            mBluetoothGatt = mDevice.connectGatt(service, /*autoConnect=*/false,

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

                    PHY_LE_1M_MASK | PHY_LE_2M_MASK, getHandler());

        } else {

            mBluetoothGatt.connect();

        }

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

        return mBluetoothGatt != null;

    }