commit b78b27693afbe9736f0a54ec473328955251f885
author Ihab Awad <ihab@google.com> Fri Jul 25 15:16:23 2014 -0700
committer Ihab Awad <ihab@google.com> Tue Jul 29 15:12:16 2014 -0700
tree 956d9d07ff961a493920569423e4cfb1b3d4f3af
parent 32291eeb876dd81ad8df9e6cb15c6e89249c5bd5

Connection creation and service wiring for WiFi call managers (2/3)

Bug: 16469413
Change-Id: Id6d495c20aa57ffc961336d49693c1a7f91d4cb3

src/com/android/telecomm/CallsManager.java

diff --git a/src/com/android/telecomm/CallsManager.java b/src/com/android/telecomm/CallsManager.java
index fc5a71a..5ce9fe8 100644
--- a/src/com/android/telecomm/CallsManager.java
+++ b/src/com/android/telecomm/CallsManager.java
@@ -270,6 +270,7 @@
                 mConnectionServiceRepository,
                 null /* handle */,
                 null /* gatewayInfo */,
+                null /* connectionManagerPhoneAccount */,
                 phoneAccountHandle,
                 true /* isIncoming */,
                 false /* isConference */);
@@ -316,6 +317,7 @@
                 mConnectionServiceRepository,
                 uriHandle,
                 gatewayInfo,
+                null /* connectionManagerPhoneAccount */,
                 accountHandle,
                 false /* isIncoming */,
                 false /* isConference */);
@@ -330,20 +332,20 @@
         final boolean emergencyCall = TelephonyUtil.shouldProcessAsEmergency(app, call.getHandle());
         if (emergencyCall) {
             // Emergency -- CreateConnectionProcessor will choose accounts automatically
-            call.setPhoneAccount(null);
+            call.setTargetPhoneAccount(null);
         } else if (accountHandle != null) {
             Log.d(this, "CALL with phone account: " + accountHandle);
-            call.setPhoneAccount(accountHandle);
+            call.setTargetPhoneAccount(accountHandle);
         } else {
             // No preset account, check if default exists
             PhoneAccountHandle defaultAccountHandle =
                     app.getPhoneAccountRegistrar().getDefaultOutgoingPhoneAccount();
             if (defaultAccountHandle != null) {
-                call.setPhoneAccount(defaultAccountHandle);
+                call.setTargetPhoneAccount(defaultAccountHandle);
             }
         }
 
-        if (call.getPhoneAccount() != null || emergencyCall) {
+        if (call.getTargetPhoneAccount() != null || emergencyCall) {
             // If the account is selected, proceed to place the outgoing call
             call.startCreateConnection();
         } else {
@@ -362,7 +364,8 @@
                 mConnectionServiceRepository,
                 null /* handle */,
                 null /* gatewayInfo */,
-                null /* phoneAccount */,
+                null /* connectionManagerPhoneAccount */,
+                null /* targetPhoneAccount */,
                 false /* isIncoming */,
                 true /* isConference */);
         conferenceCall.addListener(this);
@@ -539,7 +542,7 @@
         if (!mCalls.contains(call)) {
             Log.i(this, "Attemped to add account to unknown call %s", call);
         } else {
-            call.setPhoneAccount(account);
+            call.setTargetPhoneAccount(account);
             call.startCreateConnection();
         }
     }