commit 4134e3c019104cd0a2ae9c6cf01552c6c47ebb7a
author Linux Build Service Account <lnxbuild@localhost> Wed Mar 18 10:50:59 2015 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Mar 18 10:50:59 2015 -0700
tree 8d0a749740a43fc1c3107ed31ddda85bf74f177c
parent d9c84e82d56771e3109d8e33405765a21a0af530
parent 994531d05865327a216dbc45cc4782b9fd1e3d0d

Merge "In DSDA allow upto 4 calls" into LA.BF.1.1.1

src/com/android/server/telecom/CallsManager.java

diff --git a/src/com/android/server/telecom/CallsManager.java b/src/com/android/server/telecom/CallsManager.java
index f6990cc..7014b9b 100644
--- a/src/com/android/server/telecom/CallsManager.java
+++ b/src/com/android/server/telecom/CallsManager.java
@@ -100,6 +100,7 @@
     private static final int MAXIMUM_DSDA_LIVE_CALLS = 2;
     private static final int MAXIMUM_DSDA_HOLD_CALLS = 2;
     private static final int MAXIMUM_TOP_LEVEL_CALLS = 2;
+    private static final int MAXIMUM_DSDA_TOP_LEVEL_CALLS = 4;
 
     private static final int[] OUTGOING_CALL_STATES =
             {CallState.CONNECTING, CallState.DIALING};
@@ -1142,7 +1143,12 @@
             // we could put InCallServices into a state where they are showing two calls but
             // also support add-call. Technically it's right, but overall looks better (UI-wise)
             // and acts better if we wait until the call is removed.
-            if (count >= MAXIMUM_TOP_LEVEL_CALLS) {
+            if (TelephonyManager.getDefault().getMultiSimConfiguration()
+                    == TelephonyManager.MultiSimVariants.DSDA) {
+                if (count >= MAXIMUM_DSDA_TOP_LEVEL_CALLS) {
+                    return false;
+                }
+            } else if (count >= MAXIMUM_TOP_LEVEL_CALLS) {
                 return false;
             }