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/CallServiceWrapper.java

diff --git a/src/com/android/telecomm/CallServiceWrapper.java b/src/com/android/telecomm/CallServiceWrapper.java
index 5e0d9a8..1414e0a 100644
--- a/src/com/android/telecomm/CallServiceWrapper.java
+++ b/src/com/android/telecomm/CallServiceWrapper.java
@@ -74,10 +74,9 @@
         private static final int MSG_CAN_CONFERENCE = 12;
         private static final int MSG_SET_IS_CONFERENCED = 13;
         private static final int MSG_ADD_CONFERENCE_CALL = 14;
-        private static final int MSG_HANDOFF_CALL = 15;
-        private static final int MSG_QUERY_REMOTE_CALL_SERVICES = 16;
-        private static final int MSG_SET_CALL_VIDEO_PROVIDER = 17;
-        private static final int MSG_SET_FEATURES = 18;
+        private static final int MSG_QUERY_REMOTE_CALL_SERVICES = 15;
+        private static final int MSG_SET_CALL_VIDEO_PROVIDER = 16;
+        private static final int MSG_SET_FEATURES = 17;
 
         private final Handler mHandler = new Handler() {
             @Override
@@ -219,14 +218,6 @@
                         }
                         break;
                     }
-                    case MSG_HANDOFF_CALL:
-                        call = mCallIdMapper.getCall(msg.obj);
-                        if (call != null) {
-                            mCallsManager.startHandoffForCall(call);
-                        } else {
-                            //Log.w(this, "handoffCall, unknown call id: %s", msg.obj);
-                        }
-                        break;
                     case MSG_CAN_CONFERENCE: {
                         call = mCallIdMapper.getCall(msg.obj);
                         if (call != null) {
@@ -465,14 +456,6 @@
             mHandler.obtainMessage(MSG_ON_POST_DIAL_WAIT, args).sendToTarget();
         }
 
-        /** {@inheritDoc} */
-        @Override
-        public void handoffCall(String callId) {
-            logIncoming("handoffCall %s", callId);
-            mCallIdMapper.checkValidCallId(callId);
-            mHandler.obtainMessage(MSG_HANDOFF_CALL, callId).sendToTarget();
-        }
-
         /** ${inheritDoc} */
         @Override
         public void queryRemoteConnectionServices(RemoteServiceCallback callback) {
@@ -750,6 +733,16 @@
         }
     }
 
+    void onPhoneAccountClicked(Call call) {
+        if (isServiceValid("onPhoneAccountClicked")) {
+            try {
+                logOutgoing("onPhoneAccountClicked %s", mCallIdMapper.getCallId(call));
+                mServiceInterface.onPhoneAccountClicked(mCallIdMapper.getCallId(call));
+            } catch (RemoteException ignored) {
+            }
+        }
+    }
+
     void conference(final Call conferenceCall, Call call) {
         if (isServiceValid("conference")) {
             try {