Fix test code to use CallServiceInfo.
Change-Id: I085cfb4531571e2a712f9e7e66c782f4339bab74
diff --git a/tests/src/com/android/telecomm/testcallservice/DummyCallServiceSelector.java b/tests/src/com/android/telecomm/testcallservice/DummyCallServiceSelector.java
index da28ee9..afc82f7 100644
--- a/tests/src/com/android/telecomm/testcallservice/DummyCallServiceSelector.java
+++ b/tests/src/com/android/telecomm/testcallservice/DummyCallServiceSelector.java
@@ -21,6 +21,7 @@
import android.os.IBinder;
import android.os.RemoteException;
import android.telecomm.CallInfo;
+import android.telecomm.CallServiceInfo;
import android.telecomm.ICallServiceSelector;
import android.telecomm.ICallServiceSelectionResponse;
import android.telecomm.ICallSwitchabilityResponse;
@@ -44,10 +45,10 @@
*/
@Override public void select(
CallInfo callInfo,
- List<String> callServiceIds,
+ List<CallServiceInfo> callServiceInfos,
ICallServiceSelectionResponse response) throws RemoteException {
- response.setSelectedCallServiceIds(callServiceIds);
+ response.setSelectedCallServiceInfos(callServiceInfos);
}
/** {@inheritDoc} */
diff --git a/tests/src/com/android/telecomm/testcallservice/TestCallServiceProvider.java b/tests/src/com/android/telecomm/testcallservice/TestCallServiceProvider.java
index 81f95c4..31287e9 100644
--- a/tests/src/com/android/telecomm/testcallservice/TestCallServiceProvider.java
+++ b/tests/src/com/android/telecomm/testcallservice/TestCallServiceProvider.java
@@ -16,8 +16,10 @@
package com.android.telecomm.testcallservice;
+import android.content.ComponentName;
import android.os.IBinder;
import android.os.RemoteException;
+import android.telecomm.CallServiceInfo;
import android.telecomm.CallServiceProvider;
import android.telecomm.ICallServiceLookupResponse;
import android.util.Log;
@@ -38,9 +40,11 @@
Log.i(TAG, "lookupCallServices()");
try {
- TestCallService callService = new TestCallService(this);
- List<IBinder> callServiceList = Lists.newArrayList(callService.getBinder());
- response.setCallServices(callServiceList);
+ CallServiceInfo.Builder builder = CallServiceInfo.newBuilder(this);
+ builder.setCallService(TestCallService.class);
+ builder.setNetworkType(CallServiceInfo.FLAG_WIFI);
+
+ response.setCallServices(Lists.newArrayList(builder.build()));
} catch (RemoteException e) {
Log.e(TAG, "Failed to setCallServices().", e);
}