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

Commit 46408a7d authored by Matthew Xie's avatar Matthew Xie Committed by Android (Google) Code Review
Browse files

Merge "cancel device discovery before start pairing process" into klp-dev

parents 4e56aecb 305fb898

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

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

            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);

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

        msg.obj = device;

        msg.obj = device;

        mBondStateMachine.sendMessage(msg);

        mBondStateMachine.sendMessage(msg);