Merge 5995548a29b1fe23d7c719929f95345fdb916c97 on remote branch

Change-Id: Ic26e8fbb4ba1fc504282b78baffc45f1850c3d8f

1 files changed, 9 insertions, 0 deletions

diff --git a/src/com/android/services/telephony/TelephonyConnectionService.java b/src/com/android/services/telephony/TelephonyConnectionService.java
index 543e9340be..d5d1d952ce 100644
--- a/src/com/android/services/telephony/TelephonyConnectionService.java
+++ b/src/com/android/services/telephony/TelephonyConnectionService.java
@@ -157,6 +157,15 @@ public class TelephonyConnectionService extends ConnectionService {
                     maybeIndicateAnsweringWillDisconnect((TelephonyConnection)ringingConnection,
                             ringingConnection.getPhoneAccountHandle());
                 }
+
+                // Update context based switch based on the DSDA/DSDS scenario
+                final boolean shallDisableContextBasedSwap = isConcurrentCallsPossible();
+                for (Connection current : getAllConnections()) {
+                    if (current instanceof TelephonyConnection) {
+                        ((TelephonyConnection) current).disableContextBasedSwap(
+                                shallDisableContextBasedSwap);
+                    }
+                }
             }
         }
     };