uwb(service): Plumb vendor uci cb methods

Bug: 196225233
Test: atest ServiceUwbTests
Change-Id: Ia42924c9f8199a04baa0d06879906360225941f7

2 files changed, 6 insertions, 16 deletions

diff --git a/service/java/com/android/server/uwb/UwbServiceImpl.java b/service/java/com/android/server/uwb/UwbServiceImpl.java
index 002ac2d7..5e41c632 100644
--- a/service/java/com/android/server/uwb/UwbServiceImpl.java
+++ b/service/java/com/android/server/uwb/UwbServiceImpl.java
@@ -107,9 +107,7 @@ public class UwbServiceImpl extends IUwbAdapter.Stub {
             throws RemoteException {
         Log.i(TAG, "Register the callback");
         enforceUwbPrivilegedPermission();
-        // TODO(b/210933436): Implement this.
-        throw new IllegalStateException("Not implemented");
-        /** mUwbServiceCore.registerVendorExtensionCallback(callbacks); */
+        mUwbServiceCore.registerVendorExtensionCallback(callbacks);
     }
 
     @Override
@@ -117,9 +115,7 @@ public class UwbServiceImpl extends IUwbAdapter.Stub {
             throws RemoteException {
         Log.i(TAG, "Unregister the callback");
         enforceUwbPrivilegedPermission();
-        // TODO(b/210933436): Implement this.
-        throw new IllegalStateException("Not implemented");
-        /** mUwbServiceCore.unregisterVendorExtensionCallback(callbacks); */
+        mUwbServiceCore.unregisterVendorExtensionCallback(callbacks);
     }
 
 
diff --git a/service/tests/src/com/android/server/uwb/UwbServiceImplTest.java b/service/tests/src/com/android/server/uwb/UwbServiceImplTest.java
index b902c6f9..94f89ad6 100644
--- a/service/tests/src/com/android/server/uwb/UwbServiceImplTest.java
+++ b/service/tests/src/com/android/server/uwb/UwbServiceImplTest.java
@@ -468,21 +468,15 @@ public class UwbServiceImplTest {
     @Test
     public void testRegisterVendorExtensionCallback() throws Exception {
         final IUwbVendorUciCallback cb = mock(IUwbVendorUciCallback.class);
-
-        try {
-            mUwbServiceImpl.registerVendorExtensionCallback(cb);
-            fail();
-        } catch (IllegalStateException e) { /* pass */ }
+        mUwbServiceImpl.registerVendorExtensionCallback(cb);
+        verify(mUwbServiceCore).registerVendorExtensionCallback(cb);
     }
 
     @Test
     public void testUnregisterVendorExtensionCallback() throws Exception {
         final IUwbVendorUciCallback cb = mock(IUwbVendorUciCallback.class);
-
-        try {
-            mUwbServiceImpl.unregisterVendorExtensionCallback(cb);
-            fail();
-        } catch (IllegalStateException e) { /* pass */ }
+        mUwbServiceImpl.unregisterVendorExtensionCallback(cb);
+        verify(mUwbServiceCore).unregisterVendorExtensionCallback(cb);
     }
 
     @Test