Snap for 8775123 from a0c27a4145ed049260816c4ac1720a660e33fdc6 to s-keystone-qcom-release

Change-Id: Ib25d15b810a918adc6918c2c34a91ddc4b0f5ce3

1 files changed, 7 insertions, 5 deletions

diff --git a/src/com/android/services/telephony/TelephonyConnectionService.java b/src/com/android/services/telephony/TelephonyConnectionService.java
index d5d1d952ce..6f579b910e 100644
--- a/src/com/android/services/telephony/TelephonyConnectionService.java
+++ b/src/com/android/services/telephony/TelephonyConnectionService.java
@@ -150,12 +150,14 @@ public class TelephonyConnectionService extends ConnectionService {
                     handleTtyModeChange(isTtyNowEnabled);
                 }
             } else if (ACTION_MSIM_VOICE_CAPABILITY_CHANGED.equals(action)) {
-                // Add extra to call if answering this incoming call would cause an in progress
+                // Add extra to calls if answering one of incoming call would cause an in progress
                 // call on another subscription to be disconnected.
-                Connection ringingConnection = getRingingConnection();
-                if (ringingConnection != null) {
-                    maybeIndicateAnsweringWillDisconnect((TelephonyConnection)ringingConnection,
-                            ringingConnection.getPhoneAccountHandle());
+                for (Connection current : getAllConnections()) {
+                    if (isTelephonyConnection(current) &&
+                            current.getState() == Connection.STATE_RINGING) {
+                        maybeIndicateAnsweringWillDisconnect((TelephonyConnection)current,
+                                current.getPhoneAccountHandle());
+                    }
                 }
 
                 // Update context based switch based on the DSDA/DSDS scenario