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

Commit 6a79ada2 authored by Zach Johnson's avatar Zach Johnson
Browse files

Simplify callback register and unregister 

Bug: 145171640
Test: compile & run
Change-Id: I1de9192070f0199be7206b167266ee076dc69dab
parent 32fd48ac

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

+6 −12
Original line number Diff line number Diff line
@@ -1891,21 +1891,23 @@ public class AdapterService extends Service { 
        }



        @Override

        public void registerCallback(IBluetoothCallback cb) {

        public void registerCallback(IBluetoothCallback callback) {

            AdapterService service = getService();

            if (service == null) {

                return;

            }

            service.registerCallback(cb);



            service.mCallbacks.register(callback);

        }



        @Override

        public void unregisterCallback(IBluetoothCallback cb) {

        public void unregisterCallback(IBluetoothCallback callback) {

            AdapterService service = getService();

            if (service == null) {

                return;

            }

            service.unregisterCallback(cb);



            service.mCallbacks.unregister(callback);

        }



        @Override
@@ -2614,14 +2616,6 @@ public class AdapterService extends Service { 
        setDeviceAccessFromPrefs(device, value, SIM_ACCESS_PERMISSION_PREFERENCE_FILE);

    }



    void registerCallback(IBluetoothCallback cb) {

        mCallbacks.register(cb);

    }



    void unregisterCallback(IBluetoothCallback cb) {

        mCallbacks.unregister(cb);

    }



    public int getNumOfAdvertisementInstancesSupported() {

        enforceBluetoothPermission(this);

        return mAdapterProperties.getNumOfAdvertisementInstancesSupported();

android/app/tests/unit/src/com/android/bluetooth/btservice/AdapterServiceTest.java

+2 −2
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ public class AdapterServiceTest { 
        mAdapterService.attach(mMockContext, null, null, null, null, null);



        mAdapterService.onCreate();

        mAdapterService.registerCallback(mIBluetoothCallback);

        mServiceBinder.registerCallback(mIBluetoothCallback);



        Config.init(mMockContext);
@@ -169,7 +169,7 @@ public class AdapterServiceTest { 


    @After

    public void tearDown() {

        mAdapterService.unregisterCallback(mIBluetoothCallback);

        mServiceBinder.unregisterCallback(mIBluetoothCallback);

        mAdapterService.cleanup();

        Config.init(InstrumentationRegistry.getTargetContext());

    }