commit c92c436d84de46bb85100df9138378d9ffe0f2f2
author Sailesh Nepal <sail@google.com> Fri Jul 04 18:33:21 2014 -0700
committer Sailesh Nepal <sail@google.com> Mon Jul 07 21:09:45 2014 -0700
tree ad2a94ae545438055f891a5c4ca7d8b2beadef5f
parent 3c6d30e7ea0b66c9d9fc959242352f1afd32697f

Rename CallServiceWrapper to ConnectionServiceWrapper

Change-Id: I5a082e50dafea0104174cb97d3ae8af168944fc3

src/com/android/telecomm/InCallController.java

diff --git a/src/com/android/telecomm/InCallController.java b/src/com/android/telecomm/InCallController.java
index c1c8eaf..d1215ae 100644
--- a/src/com/android/telecomm/InCallController.java
+++ b/src/com/android/telecomm/InCallController.java
@@ -103,10 +103,10 @@
     }
 
     @Override
-    public void onCallServiceChanged(
+    public void onConnectionServiceChanged(
             Call call,
-            CallServiceWrapper oldCallServiceWrapper,
-            CallServiceWrapper newCallService) {
+            ConnectionServiceWrapper oldService,
+            ConnectionServiceWrapper newService) {
         updateCall(call);
     }
 
@@ -261,8 +261,8 @@
 
     private InCallCall toInCallCall(Call call) {
         String callId = mCallIdMapper.getCallId(call);
-        CallServiceDescriptor descriptor =
-                call.getCallService() != null ? call.getCallService().getDescriptor() : null;
+        CallServiceDescriptor descriptor = call.getConnectionService() != null ?
+                call.getConnectionService().getDescriptor() : null;
 
         int capabilities = CallCapabilities.HOLD | CallCapabilities.MUTE;
         if (CallsManager.getInstance().isAddCallCapable(call)) {