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

Commit fdb9111e authored by Zach Johnson's avatar Zach Johnson
Browse files

Merge createBond and createBondOutOfBand 

Pass a null OobData to pair without it.

Bug: 145171640
Test: compile & pair
Change-Id: I0b6f023dbb50d4b7499c5101fa052420030ccf93
parent df64ad9e

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

+1 −13
Original line number Diff line number Diff line
@@ -1371,7 +1371,7 @@ public class AdapterService extends Service { 
        }



        @Override

        public boolean createBond(BluetoothDevice device, int transport) {

        public boolean createBond(BluetoothDevice device, int transport, OobData oobData) {

            AdapterService service = getService();

            if (service == null || !callerIsSystemOrActiveOrManagedUser(service, TAG, "createBond")) {

                return false;
@@ -1379,18 +1379,6 @@ public class AdapterService extends Service { 


            enforceBluetoothAdminPermission(service);



            return service.createBond(device, transport, null);

        }



        @Override

        public boolean createBondOutOfBand(BluetoothDevice device, int transport, OobData oobData) {

            AdapterService service = getService();

            if (service == null || !callerIsSystemOrActiveOrManagedUser(service, TAG, "createBondOutOfBand")) {

                return false;

            }



            enforceBluetoothAdminPermission(service);



            return service.createBond(device, transport, oobData);

        }