Use the new adapter APIs
Change-Id: I58ca5c6970328861327699ec497fa21288bce7df
diff --git a/src/com/android/telecomm/EmergencyCallServiceSelector.java b/src/com/android/telecomm/EmergencyCallServiceSelector.java
index d5f2774..18a5b15 100644
--- a/src/com/android/telecomm/EmergencyCallServiceSelector.java
+++ b/src/com/android/telecomm/EmergencyCallServiceSelector.java
@@ -36,7 +36,6 @@
* first ones to try to place the call.
*/
public class EmergencyCallServiceSelector extends CallServiceSelector {
- CallServiceSelectorAdapter mAdapter = null;
/**
* Returns true if the handle passed in is to a potential emergency number.
@@ -48,12 +47,6 @@
/** {@inheritDoc} */
@Override
- protected void setCallServiceSelectorAdapter(CallServiceSelectorAdapter adapter) {
- mAdapter = adapter;
- }
-
- /** {@inheritDoc} */
- @Override
protected void select(CallInfo callInfo, List<CallServiceDescriptor> descriptors) {
List<CallServiceDescriptor> selectedDescriptors = Lists.newArrayList();
@@ -75,8 +68,6 @@
}
}
- if (mAdapter != null) {
- mAdapter.setSelectedCallServices(callInfo.getId(), selectedDescriptors);
- }
+ getAdapter().setSelectedCallServices(callInfo.getId(), selectedDescriptors);
}
}
diff --git a/tests/src/com/android/telecomm/testcallservice/DummyCallServiceSelector.java b/tests/src/com/android/telecomm/testcallservice/DummyCallServiceSelector.java
index f759291..c267867 100644
--- a/tests/src/com/android/telecomm/testcallservice/DummyCallServiceSelector.java
+++ b/tests/src/com/android/telecomm/testcallservice/DummyCallServiceSelector.java
@@ -30,12 +30,6 @@
* was given. Also returns false for every request on switchability.
*/
public class DummyCallServiceSelector extends CallServiceSelector {
- private CallServiceSelectorAdapter mAdapter;
-
- @Override
- protected void setCallServiceSelectorAdapter(CallServiceSelectorAdapter adapter) {
- mAdapter = adapter;
- }
@Override
protected void select(CallInfo callInfo, List<CallServiceDescriptor> descriptors) {
@@ -49,6 +43,6 @@
}
}
- mAdapter.setSelectedCallServices(callInfo.getId(), orderedList);
+ getAdapter().setSelectedCallServices(callInfo.getId(), orderedList);
}
}
diff --git a/tests/src/com/android/telecomm/testcallservice/TestCallService.java b/tests/src/com/android/telecomm/testcallservice/TestCallService.java
index 4e459a3..f6e2da7 100644
--- a/tests/src/com/android/telecomm/testcallservice/TestCallService.java
+++ b/tests/src/com/android/telecomm/testcallservice/TestCallService.java
@@ -49,21 +49,15 @@
private Set<String> mLiveCallIds;
/**
- * Adapter to call back into CallsManager.
- */
- private CallServiceAdapter mTelecommAdapter;
-
- /**
* Used to play an audio tone during a call.
*/
private MediaPlayer mMediaPlayer;
/** {@inheritDoc} */
@Override
- public void setCallServiceAdapter(CallServiceAdapter callServiceAdapter) {
+ public void onAdapterAttached(CallServiceAdapter callServiceAdapter) {
Log.i(TAG, "setCallServiceAdapter()");
- mTelecommAdapter = callServiceAdapter;
mLiveCallIds = Sets.newHashSet();
mMediaPlayer = createMediaPlayer();
@@ -87,7 +81,7 @@
// Returning positively on setCompatibleWith() doesn't guarantee that we will be chosen
// to place the call. If we *are* chosen then CallsManager will execute the call()
// method below.
- mTelecommAdapter.setIsCompatibleWith(callInfo.getId(), isCompatible);
+ getAdapter().setIsCompatibleWith(callInfo.getId(), isCompatible);
}
/**
@@ -107,7 +101,7 @@
}
createCall(callInfo.getId());
- mTelecommAdapter.handleSuccessfulOutgoingCall(callInfo.getId());
+ getAdapter().handleSuccessfulOutgoingCall(callInfo.getId());
}
/** {@inheritDoc} */
@@ -126,20 +120,20 @@
Uri handle = Uri.fromParts("tel", "5551234", null);
CallInfo callInfo = new CallInfo(callId, CallState.RINGING, handle);
- mTelecommAdapter.notifyIncomingCall(callInfo);
+ getAdapter().notifyIncomingCall(callInfo);
}
/** {@inheritDoc} */
@Override
public void answer(String callId) {
- mTelecommAdapter.setActive(callId);
+ getAdapter().setActive(callId);
createCall(callId);
}
/** {@inheritDoc} */
@Override
public void reject(String callId) {
- mTelecommAdapter.setDisconnected(callId, DisconnectCause.INCOMING_REJECTED, null);
+ getAdapter().setDisconnected(callId, DisconnectCause.INCOMING_REJECTED, null);
}
/** {@inheritDoc} */
@@ -148,21 +142,21 @@
Log.i(TAG, "disconnect(" + callId + ")");
destroyCall(callId);
- mTelecommAdapter.setDisconnected(callId, DisconnectCause.LOCAL, null);
+ getAdapter().setDisconnected(callId, DisconnectCause.LOCAL, null);
}
/** {@inheritDoc} */
@Override
public void hold(String callId) {
Log.i(TAG, "hold(" + callId + ")");
- mTelecommAdapter.setOnHold(callId);
+ getAdapter().setOnHold(callId);
}
/** {@inheritDoc} */
@Override
public void unhold(String callId) {
Log.i(TAG, "unhold(" + callId + ")");
- mTelecommAdapter.setActive(callId);
+ getAdapter().setActive(callId);
}
/** {@inheritDoc} */