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

Commit 62eb537f authored by Myles Watson's avatar Myles Watson Committed by Automerger Merge Worker
Browse files

Merge "change BAS connectGatt from TRANSPORT_AUTO to TRANSPORT_LE" am: a60a5c5c am: 40aabed9 

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



Change-Id: I6ea6806e072b0a250cf88024a0275fe883d151de
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 26d777ba 40aabed9

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

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ package com.android.bluetooth.bas; 


import static android.bluetooth.BluetoothDevice.PHY_LE_1M_MASK;

import static android.bluetooth.BluetoothDevice.PHY_LE_2M_MASK;

import static android.bluetooth.BluetoothDevice.TRANSPORT_AUTO;

import static android.bluetooth.BluetoothDevice.TRANSPORT_LE;



import android.bluetooth.BluetoothDevice;

import android.bluetooth.BluetoothGatt;
@@ -233,7 +233,7 @@ public class BatteryStateMachine extends StateMachine { 
            mBluetoothGatt.close();

        }

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

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

                mGattCallback, TRANSPORT_LE, /*opportunistic=*/true,

                PHY_LE_1M_MASK | PHY_LE_2M_MASK, getHandler());

        return mBluetoothGatt != null;

    }