commit 905dfba7883666f45a0c6958d8bc6c19d68972d9
author Sailesh Nepal <sail@google.com> Mon Jul 14 08:20:41 2014 -0700
committer Sailesh Nepal <sail@google.com> Mon Jul 14 23:23:25 2014 +0000
tree 3b2a7a08ba5936023e4fb552b623d35ce4f9da25
parent 490459ecb8ac18021129ad36ca3d556e4e1c18ca

Remove CallServiceProvider and CallServiceDescript: Impl do not merge

This CL removes usage CallServiceProvider. Instead
ConnectionServiceRepository uses package manager to look up
all ConnectionService implementations.

Everywhere we used CallServiceDescriptors has now been
replaced by ComponentNames.

Change-Id: I2e40c5c64c0d242dc41b680943d7e9209142db5b
(cherry picked from commit 10e6050b2186650fbc18b0aa62b2e7d74e0aa80a)

src/com/android/telecomm/Switchboard.java

diff --git a/src/com/android/telecomm/Switchboard.java b/src/com/android/telecomm/Switchboard.java
index b7a7e9e..2dfcfea 100644
--- a/src/com/android/telecomm/Switchboard.java
+++ b/src/com/android/telecomm/Switchboard.java
@@ -20,10 +20,8 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.telecomm.CallServiceDescriptor;
 import android.telecomm.TelecommConstants;
 
-import com.android.telecomm.BaseRepository.LookupCallback;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableCollection;
 import com.google.common.collect.ImmutableList;
@@ -42,7 +40,7 @@
     /** Used to retrieve incoming call details. */
     private final IncomingCallsManager mIncomingCallsManager;
 
-    private final CallServiceRepository mCallServiceRepository;
+    private final ConnectionServiceRepository mConnectionServiceRepository;
 
     /** Singleton accessor. */
     static Switchboard getInstance() {
@@ -56,26 +54,24 @@
         ThreadUtil.checkOnMainThread();
 
         mIncomingCallsManager = new IncomingCallsManager();
-        mCallServiceRepository =
-                new CallServiceRepository(mIncomingCallsManager);
+        mConnectionServiceRepository =
+                new ConnectionServiceRepository(mIncomingCallsManager);
     }
 
-    CallServiceRepository getCallServiceRepository() {
-        return mCallServiceRepository;
+    ConnectionServiceRepository getConnectionServiceRepository() {
+        return mConnectionServiceRepository;
     }
 
     /**
      * Retrieves details about the incoming call through the incoming call manager.
      *
      * @param call The call object.
-     * @param descriptor The relevant call-service descriptor.
-     * @param extras The optional extras passed via
-     *         {@link TelecommConstants#EXTRA_INCOMING_CALL_EXTRAS}
      */
-    void retrieveIncomingCall(Call call, CallServiceDescriptor descriptor, Bundle extras) {
+    void retrieveIncomingCall(Call call) {
         Log.d(this, "retrieveIncomingCall");
-        ConnectionServiceWrapper service = mCallServiceRepository.getService(descriptor);
+        ConnectionServiceWrapper service = mConnectionServiceRepository.getService(
+                call.getPhoneAccount().getComponentName());
         call.setConnectionService(service);
-        mIncomingCallsManager.retrieveIncomingCall(call, extras);
+        mIncomingCallsManager.retrieveIncomingCall(call);
     }
 }