CallInfo usage everywhere; selector using call-service Id strings.

Change-Id: Ide81dc869d6e025a83685b7247ee4179ec7097ab

3 files changed, 13 insertions, 16 deletions

diff --git a/telecomm/java/android/telecomm/ICallServiceAdapter.aidl b/telecomm/java/android/telecomm/ICallServiceAdapter.aidl
index 526351e..48622d3 100644
--- a/telecomm/java/android/telecomm/ICallServiceAdapter.aidl
+++ b/telecomm/java/android/telecomm/ICallServiceAdapter.aidl
@@ -43,13 +43,12 @@ oneway interface ICallServiceAdapter {
     void setCompatibleWith(String callId, boolean isCompatible);
 
     /**
-     * Tells CallsManager of a new incoming call.
+     * Tells CallsManager of a new incoming call. CallInfo should be populated using a new call ID
+     * retrieved via {@link #getNextCallId}.
      *
-     * @param handle The handle to the other party or null if no such handle is available (as with
-     *     blocked caller ID).
-     * @param callId The unique ID (via {@link #getNextCallId}) of the new incoming call.
+     * @param callInfo The details of the relevant call.
      */
-    void newIncomingCall(String handle, String callId);
+    void newIncomingCall(in CallInfo callInfo);
 
     /**
      * Tells CallsManager of a new outgoing call. Use of this method should always follow
diff --git a/telecomm/java/android/telecomm/ICallServiceSelectionResponse.aidl b/telecomm/java/android/telecomm/ICallServiceSelectionResponse.aidl
index 143d171..710f5f6 100644
--- a/telecomm/java/android/telecomm/ICallServiceSelectionResponse.aidl
+++ b/telecomm/java/android/telecomm/ICallServiceSelectionResponse.aidl
@@ -29,10 +29,8 @@ oneway interface ICallServiceSelectionResponse {
      * Records the sorted set of call services that are preferred by the corresponding
      * call-service selector.
      *
-     * @param callServiceBinders The relevant call-service binders ordered by priority (most
-     *         desired first).
-     * TODO(gilad): Move to use call-service IDs or (reduced-visibility) call-service wrappers
-     * instead, see isSwitchable/callId in ICallServiceSelector.aidl for more details.
+     * @param selectedCallServiceIds The relevant call-service IDs ordered by priority (most desired
+     *         first).
      */
-    void setPreferredCallServices(in List<IBinder> callServiceBinders);
+    void setSelectedCallServiceIds(in List<String> selectedCallServiceIds);
 }
diff --git a/telecomm/java/android/telecomm/ICallServiceSelector.aidl b/telecomm/java/android/telecomm/ICallServiceSelector.aidl
index 58cbf6c..8841f5e 100644
--- a/telecomm/java/android/telecomm/ICallServiceSelector.aidl
+++ b/telecomm/java/android/telecomm/ICallServiceSelector.aidl
@@ -66,17 +66,17 @@ import java.util.List;
 oneway interface ICallServiceSelector {
 
     /**
-     * Initiates the process to retrieve the sorted set of call services that are preferred
-     * by this call-service selector.
+     * Initiates the process to retrieve the sorted set of call service IDs that are preferred by
+     * this call-service selector.
      *
      * @param callInfo The details of the relevant call.
-     * @param callServiceBinders The list of binders to select call services from.
-     * @param response The response object through which the selected services are passed back
-     *         to the switchboard.
+     * @param callServiceIds The list of call-service IDs.
+     * @param response The response object through which the selected service IDs are passed back
+     *         to Telecomm.
      */
     void select(
             in CallInfo callInfo,
-            in List<IBinder> callServiceBinders,
+            in List<String> callServiceIds,
             in ICallServiceSelectionResponse response);
 
     /**