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/InCallController.java

diff --git a/src/com/android/telecomm/InCallController.java b/src/com/android/telecomm/InCallController.java
index d8e4030..3824c6f 100644
--- a/src/com/android/telecomm/InCallController.java
+++ b/src/com/android/telecomm/InCallController.java
@@ -29,7 +29,6 @@
 import android.telecomm.CallAudioState;
 import android.telecomm.CallCapabilities;
 import android.telecomm.CallPropertyPresentation;
-import android.telecomm.CallServiceDescriptor;
 import android.telecomm.CallState;
 import android.telecomm.InCallCall;
 
@@ -275,8 +274,6 @@
 
     private InCallCall toInCallCall(Call call) {
         String callId = mCallIdMapper.getCallId(call);
-        CallServiceDescriptor descriptor = call.getConnectionService() != null ?
-                call.getConnectionService().getDescriptor() : null;
 
         int capabilities = call.getCallCapabilities();
         if (!CallsManager.getInstance().isAddCallCapable(call)) {
@@ -321,7 +318,7 @@
                 call.getCannedSmsResponses(), capabilities, connectTimeMillis, handle,
                 call.getHandlePresentation(), callerDisplayName,
                 call.getCallerDisplayNamePresentation(), call.getGatewayInfo(),
-                call.getPhoneAccount(), descriptor, call.getCallVideoProvider(), parentCallId,
-                childCallIds, call.getStatusHints());
+                call.getPhoneAccount(), call.getCallVideoProvider(), parentCallId, childCallIds,
+                call.getStatusHints());
     }
 }