Merge "When adding a new call, use same phone account for call." into lmp-mr1-dev
diff --git a/src/com/android/server/telecom/CallsManager.java b/src/com/android/server/telecom/CallsManager.java
index 84bdff8..7bbe031 100644
--- a/src/com/android/server/telecom/CallsManager.java
+++ b/src/com/android/server/telecom/CallsManager.java
@@ -452,6 +452,11 @@
Log.v(this, "startOutgoingCall found accounts = " + accounts);
+ if (mForegroundCall != null && mForegroundCall.getTargetPhoneAccount() != null) {
+ // If there is an ongoing call, use the same phone account to place this new call.
+ phoneAccountHandle = mForegroundCall.getTargetPhoneAccount();
+ }
+
// Only dial with the requested phoneAccount if it is still valid. Otherwise treat this call
// as if a phoneAccount was not specified (does the default behavior instead).
// Note: We will not attempt to dial with a requested phoneAccount if it is disabled.