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

Commit 95b11ce7 authored by Zach Johnson's avatar Zach Johnson Committed by Gerrit Code Review
Browse files

Merge changes from topics "merge BT bond", "parameterize BT enable", "remove BT isEnabled" 

* changes:
  Merge createBond and createBondOutOfBand
  Parameterize enable, remove duplicate code
  Remove isEnabled
parents 6d136dbb fdb9111e

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

+3 −40
Original line number Diff line number Diff line
@@ -1062,19 +1062,6 @@ public class AdapterService extends Service { 
            return null;

        }



        @Override

        public boolean isEnabled() {

            // don't check caller, may be called from system UI

            AdapterService service = getService();

            if (service == null) {

                return false;

            }



            enforceBluetoothPermission(service);



            return service.getState() == BluetoothAdapter.STATE_ON;

        }



        @Override

        public int getState() {

            // don't check caller, may be called from system UI
@@ -1089,7 +1076,7 @@ public class AdapterService extends Service { 
        }



        @Override

        public boolean enable() {

        public boolean enable(boolean quietMode) {

            AdapterService service = getService();

            if (service == null || !callerIsSystemOrActiveUser(TAG, "enable")) {

                return false;
@@ -1097,19 +1084,7 @@ public class AdapterService extends Service { 


            enforceBluetoothAdminPermission(service);



            return service.enable(false);

        }



        @Override

        public boolean enableNoAutoConnect() {

            AdapterService service = getService();

            if (service == null || !callerIsSystemOrActiveUser(TAG, "enableNoAutoConnect")) {

                return false;

            }



            enforceBluetoothAdminPermission(service);



            return service.enable(true);

            return service.enable(quietMode);

        }



        @Override
@@ -1397,7 +1372,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;
@@ -1405,18 +1380,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);

        }