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

diff --git a/src/com/android/telecomm/IncomingCallsManager.java b/src/com/android/telecomm/IncomingCallsManager.java
index 5a874ea..197f699 100644
--- a/src/com/android/telecomm/IncomingCallsManager.java
+++ b/src/com/android/telecomm/IncomingCallsManager.java
@@ -17,8 +17,8 @@
 package com.android.telecomm;
 
 import android.os.Bundle;
-import android.telecomm.CallInfo;
-import android.telecomm.CallService;
+import android.telecomm.ConnectionService;
+import android.telecomm.ConnectionRequest;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Maps;
@@ -34,11 +34,12 @@
     private final Set<Call> mPendingIncomingCalls = Sets.newLinkedHashSet();
 
     /**
-     * Retrieves details of an incoming call through its associated call service.
+     * Retrieves details of an incoming call through its associated connection service.
      *
      * @param call The call object.
      * @param extras The optional extras passed with the incoming call intent (to be returned to
-     *     the call service via {@link CallService#setIncomingCallId(String, android.os.Bundle)}).
+     *     the connection service via
+     *     {@link ConnectionService#createIncomingCall(ConnectionRequest)}.
      */
     void retrieveIncomingCall(final Call call, Bundle extras) {
         ThreadUtil.checkOnMainThread();
@@ -55,22 +56,22 @@
             }
         };
 
-        call.getCallService().setIncomingCallId(call, extras, errorCallback);
+        call.getConnectionService().createIncomingCall(call, extras, errorCallback);
     }
 
     /**
      * Notifies the incoming call of success after removing it from the pending
      * list.
      *
-     * @param callInfo The details of the call.
+     * @param request The details of the call.
      */
-    void handleSuccessfulIncomingCall(Call call, CallInfo callInfo) {
+    void handleSuccessfulIncomingCall(Call call, ConnectionRequest request) {
         ThreadUtil.checkOnMainThread();
 
         if (mPendingIncomingCalls.contains(call)) {
             Log.d(this, "Incoming call %s found.", call);
             mPendingIncomingCalls.remove(call);
-            call.handleVerifiedIncoming(callInfo);
+            call.handleVerifiedIncoming(request);
         }
     }