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

Commit ee6898a4 authored by Matthew Xie's avatar Matthew Xie Committed by Android Git Automerger
Browse files

am e56c70f6: am cd68000c: Merge "cancel device discovery before start pairing process" into klp-dev 

* commit 'e56c70f6':
  cancel device discovery before start pairing process
parents 2a963d9c e56c70f6

src/com/android/bluetooth/btservice/AdapterService.java

+4 −0
Original line number Diff line number Diff line
@@ -1055,6 +1055,10 @@ public class AdapterService extends Service { 
            return false;

        }



        // Pairing is unreliable while scanning, so cancel discovery

        // Note, remove this when native stack improves

        cancelDiscoveryNative();



        Message msg = mBondStateMachine.obtainMessage(BondStateMachine.CREATE_BOND);

        msg.obj = device;

        mBondStateMachine.sendMessage(msg);