Make incoming calls work.
This is a CL of random changes. Ties of loose ends which were previously
commented and adds new wiring to connect all the pieces together.
After this CL, incoming calls are functional for call services.
Change-Id: I6fa1e70b816094587849329790236f9289ec260b
diff --git a/src/com/android/telecomm/CallsManager.java b/src/com/android/telecomm/CallsManager.java
index 9922102..c049e18 100644
--- a/src/com/android/telecomm/CallsManager.java
+++ b/src/com/android/telecomm/CallsManager.java
@@ -84,21 +84,20 @@
}
/**
- * Starts the incoming call sequence by having switchboard confirm with the specified call
- * service that an incoming call actually exists for the specified call token. Upon success,
- * execution returns to {@link #handleSuccessfulIncomingCall} to start the in-call UI.
+ * Starts the incoming call sequence by having switchboard gather more information about the
+ * specified call; using the specified call service descriptor. Upon success, execution returns
+ * to {@link #handleSuccessfulIncomingCall} to start the in-call UI.
*
* @param descriptor The descriptor of the call service to use for this incoming call.
- * @param callToken The token used by the call service to identify the incoming call.
*/
- void processIncomingCallIntent(CallServiceDescriptor descriptor, String callToken) {
+ void processIncomingCallIntent(CallServiceDescriptor descriptor) {
Log.d(TAG, "processIncomingCallIntent");
// Create a call with no handle. Eventually, switchboard will update the call with
// additional information from the call service, but for now we just need one to pass around
// with a unique call ID.
- Call call = new Call(null, null);
+ Call call = new Call();
- mSwitchboard.confirmIncomingCall(call, descriptor, callToken);
+ mSwitchboard.retrieveIncomingCall(call, descriptor);
}
/**