commit 77da19ea28b8753d439660b4352c1bf914f63a92
author Sailesh Nepal <sail@google.com> Wed Jul 02 21:31:16 2014 -0700
committer Sailesh Nepal <sail@google.com> Wed Jul 02 21:31:16 2014 -0700
tree dea6cd91c452e0f2eb955c71e5cefb38d9484dc5
parent dd94acac827419d12d757769f9906d0477dc4001

Remove handoff implementation

This CL removes the old handoff implementation. It also
plumbs the phoneAccountClicked event from InCallUI to the
call's ConnectionService.

Change-Id: Iab1595faaadcdfe428d97891d314babea21e9633

src/com/android/telecomm/InCallController.java

diff --git a/src/com/android/telecomm/InCallController.java b/src/com/android/telecomm/InCallController.java
index 9b53609..c1c8eaf 100644
--- a/src/com/android/telecomm/InCallController.java
+++ b/src/com/android/telecomm/InCallController.java
@@ -103,11 +103,6 @@
     }
 
     @Override
-    public void onCallHandoffHandleChanged(Call call, Uri oldHandle, Uri newHandle) {
-        updateCall(call);
-    }
-
-    @Override
     public void onCallServiceChanged(
             Call call,
             CallServiceWrapper oldCallServiceWrapper,
@@ -116,14 +111,6 @@
     }
 
     @Override
-    public void onCallHandoffCallServiceDescriptorChanged(
-            Call call,
-            CallServiceDescriptor oldDescriptor,
-            CallServiceDescriptor newDescriptor) {
-        updateCall(call);
-    }
-
-    @Override
     public void onAudioStateChanged(CallAudioState oldAudioState, CallAudioState newAudioState) {
         if (mInCallService != null) {
             Log.i(this, "Calling onAudioStateChanged, audioState: %s -> %s", oldAudioState,
@@ -277,11 +264,7 @@
         CallServiceDescriptor descriptor =
                 call.getCallService() != null ? call.getCallService().getDescriptor() : null;
 
-        boolean isHandoffCapable = call.getHandoffHandle() != null;
         int capabilities = CallCapabilities.HOLD | CallCapabilities.MUTE;
-        if (call.getHandoffHandle() != null) {
-            capabilities |= CallCapabilities.CONNECTION_HANDOFF;
-        }
         if (CallsManager.getInstance().isAddCallCapable(call)) {
             capabilities |= CallCapabilities.ADD_CALL;
         }
@@ -292,10 +275,6 @@
         if (state == CallState.ABORTED) {
             state = CallState.DISCONNECTED;
         }
-        // TODO(sail): Remove this and replace with final reconnecting code.
-        if (state == CallState.DISCONNECTED && call.getHandoffCallServiceDescriptor() != null) {
-            state = CallState.ACTIVE;
-        }
 
         String parentCallId = null;
         Call parentCall = call.getParentCall();
@@ -320,8 +299,7 @@
 
         return new InCallCall(callId, state, call.getDisconnectCause(), call.getDisconnectMessage(),
                 call.getCannedSmsResponses(), capabilities, connectTimeMillis, call.getHandle(),
-                call.getGatewayInfo(), call.getAccount(), descriptor,
-                call.getHandoffCallServiceDescriptor(), call.getCallVideoProvider(),
+                call.getGatewayInfo(), call.getAccount(), descriptor, call.getCallVideoProvider(),
                 parentCallId, childCallIds, call.getFeatures());
     }