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

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

Parameterize enable, remove duplicate code 

Bug: 145171640
Test: compile & verify starts
Change-Id: I9d3be31e935dd8edc69e19d9d6cf760c97d16243
parent ce6d0288

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

+2 −14
Original line number Diff line number Diff line
@@ -1075,7 +1075,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;
@@ -1083,19 +1083,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