Use CallServiceWrappers in place of ICallService.

Change-Id: Icd8a6ae2401f68d04b359fb7539b6d4f5aafecd5
diff --git a/src/com/android/telecomm/CallServiceProviderWrapper.java b/src/com/android/telecomm/CallServiceProviderWrapper.java
index 044d370..18cff35 100644
--- a/src/com/android/telecomm/CallServiceProviderWrapper.java
+++ b/src/com/android/telecomm/CallServiceProviderWrapper.java
@@ -45,28 +45,30 @@
     private ICallServiceProvider mServiceInterface;
 
     /**
-     * The class to notify when the binding succeeds or fails.
+     * The class to notify when binding succeeds or fails.
      */
-    private final CallServiceFinder mFinder;
+    private final CallServiceRepository mRepository;
 
     /**
      * Creates a call-service provider for the specified component.
+     *
+     * @param componentName The component name of the service to bind to.
+     * @param repository The call-service repository.
      */
-    public CallServiceProviderWrapper(ComponentName componentName, CallServiceFinder finder) {
+    public CallServiceProviderWrapper(ComponentName componentName, CallServiceRepository repository) {
         super(CALL_SERVICE_PROVIDER_ACTION, componentName);
-        mFinder = finder;
+        mRepository = repository;
     }
 
     /** {@inheritDoc} */
     @Override public void handleSuccessfulConnection(IBinder binder) {
         mServiceInterface = ICallServiceProvider.Stub.asInterface(binder);
-        mFinder.registerProvider(getComponentName(), this);
+        mRepository.processProvider(getComponentName(), this);
     }
 
     /** {@inheritDoc} */
     @Override public void handleFailedConnection() {
-        mFinder.unregisterProvider(getComponentName());
-        // TODO(santoscordon): Notify CallServiceFinder.
+        mRepository.abortProvider(getComponentName());
     }
 
     /** {@inheritDoc} */
@@ -75,7 +77,9 @@
         // TODO(santoscordon): fill in.
     }
 
-    /** See {@link ICallServiceProvider#lookupCallServices}. */
+    /**
+     * See {@link ICallServiceProvider#lookupCallServices}.
+     */
     public void lookupCallServices(ICallServiceLookupResponse response) {
         try {
             if (mServiceInterface == null) {