commit 18386a8a98dee5cf6bb55eff7eab4109ba2b3c56
author Sailesh Nepal <sail@google.com> Wed Mar 19 10:22:40 2014 -0700
committer Sailesh Nepal <sail@google.com> Wed Mar 19 16:37:53 2014 -0700
tree 03e6b8c685cbbc5702e7ca9bcd1410a17b27bab5
parent 7923beee5d206f121eccaf6e3fcf1f5f37480913

Use TelephonyCallServiceSelector as fallback

Also added a CallServiceSelectorWrapper.

Change-Id: I49ff7a372dbee270735f7cc13f3bf7a9766c04f0

src/com/android/telecomm/Call.java

diff --git a/src/com/android/telecomm/Call.java b/src/com/android/telecomm/Call.java
index 82bde9e..57074b7 100644
--- a/src/com/android/telecomm/Call.java
+++ b/src/com/android/telecomm/Call.java
@@ -20,7 +20,6 @@
 import android.telecomm.CallInfo;
 import android.telecomm.CallState;
 
-import com.android.internal.telecomm.ICallServiceSelector;
 import com.google.android.collect.Sets;
 import com.google.common.base.Preconditions;
 
@@ -65,9 +64,8 @@
 
     /**
      * The call-service selector for this call.
-     * TODO(gilad): Switch to using a wrapper object, see {@link #mCallService}.
      */
-    private ICallServiceSelector mCallServiceSelector;
+    private CallServiceSelectorWrapper mCallServiceSelector;
 
     /** Read-only and parcelable version of this call. */
     private CallInfo mCallInfo;
@@ -188,7 +186,7 @@
         }
     }
 
-    void setCallServiceSelector(ICallServiceSelector selector) {
+    void setCallServiceSelector(CallServiceSelectorWrapper selector) {
         Preconditions.checkNotNull(selector);
         mCallServiceSelector = selector;
     }