commit 6a79ada25761440d9821ea9300ceec74494b68f4
author Zach Johnson <zachoverflow@google.com> Tue Nov 26 18:38:05 2019 -0800
committer Zach Johnson <zachoverflow@google.com> Thu Dec 05 17:28:41 2019 -0800
tree e981296fdf6309a508ffacc37ab94b2aacb5e63a
parent 32fd48ac8ffbd500b494ff027e89c6ad7f9c5e83

Simplify callback register and unregister

Bug: 145171640
Test: compile & run
Change-Id: I1de9192070f0199be7206b167266ee076dc69dab

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

diff --git a/android/app/src/com/android/bluetooth/btservice/AdapterService.java b/android/app/src/com/android/bluetooth/btservice/AdapterService.java
index a97b17b..1540534 100644
--- a/android/app/src/com/android/bluetooth/btservice/AdapterService.java
+++ b/android/app/src/com/android/bluetooth/btservice/AdapterService.java
@@ -1891,21 +1891,23 @@
         }
 
         @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 @@
         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

diff --git a/android/app/tests/unit/src/com/android/bluetooth/btservice/AdapterServiceTest.java b/android/app/tests/unit/src/com/android/bluetooth/btservice/AdapterServiceTest.java
index e72d8e0..63a46ab 100644
--- a/android/app/tests/unit/src/com/android/bluetooth/btservice/AdapterServiceTest.java
+++ b/android/app/tests/unit/src/com/android/bluetooth/btservice/AdapterServiceTest.java
@@ -159,7 +159,7 @@
         mAdapterService.attach(mMockContext, null, null, null, null, null);
 
         mAdapterService.onCreate();
-        mAdapterService.registerCallback(mIBluetoothCallback);
+        mServiceBinder.registerCallback(mIBluetoothCallback);
 
         Config.init(mMockContext);
 
@@ -169,7 +169,7 @@
 
     @After
     public void tearDown() {
-        mAdapterService.unregisterCallback(mIBluetoothCallback);
+        mServiceBinder.unregisterCallback(mIBluetoothCallback);
         mAdapterService.cleanup();
         Config.init(InstrumentationRegistry.getTargetContext());
     }