commit bfb6832c4bcc535aef12b07ac5bcf4a973c65d00
author Sailesh Nepal <sail@google.com> Thu Nov 07 14:07:41 2013 -0800
committer Sailesh Nepal <sail@google.com> Thu Nov 07 14:22:09 2013 -0800
tree 6fc2e200d0ad3d982737d88885be140bff8c762d
parent 37e52cec7fd0b95a4671aebbc57e51f67c0d9479

Instantiate third party phone on call DO NOT MERGE

With this CL we now create a new third party phone as needed.

Change-Id: I31880c9ac758ddf7f9538e1c182197b8d3e073e4

src/com/android/phone/CallController.java

diff --git a/src/com/android/phone/CallController.java b/src/com/android/phone/CallController.java
index 52dbf76..1da6d36 100644
--- a/src/com/android/phone/CallController.java
+++ b/src/com/android/phone/CallController.java
@@ -26,6 +26,7 @@
 import com.android.phone.OtaUtils.CdmaOtaScreenState;
 
 import android.app.AlertDialog;
+import android.content.ComponentName;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Handler;
@@ -324,7 +325,10 @@
             // or any of combinations
             String sipPhoneUri = intent.getStringExtra(
                     OutgoingCallBroadcaster.EXTRA_SIP_PHONE_URI);
-            phone = PhoneUtils.pickPhoneBasedOnNumber(mCM, scheme, number, sipPhoneUri);
+            ComponentName thirdPartyCallComponent = (ComponentName) intent.getParcelableExtra(
+                    OutgoingCallBroadcaster.EXTRA_THIRD_PARTY_CALL_COMPONENT);
+            phone = PhoneUtils.pickPhoneBasedOnNumber(mCM, scheme, number, sipPhoneUri,
+                    thirdPartyCallComponent);
             if (VDBG) log("- got Phone instance: " + phone + ", class = " + phone.getClass());
 
             // update okToCallStatus based on new phone