commit e9641f8664ee9d313c1f3889a3e1e34f593d7837
author Treehugger Robot <treehugger-gerrit@google.com> Thu Nov 23 02:45:49 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Nov 23 02:45:49 2017 +0000
tree 6d97ae7ea8e40418662d25141e8393e0cbbbdc20
parent 8bfd9a8caae7b2c996c330dcd6d2daafe0975ee5
parent 38af651c6e0181957533fc31fca265c09dab05d2

Merge "Prevent SIM selection and change SIM from showing when there are active calls"

java/com/android/dialer/precall/impl/CallingAccountSelector.java

diff --git a/java/com/android/dialer/precall/impl/CallingAccountSelector.java b/java/com/android/dialer/precall/impl/CallingAccountSelector.java
index 8d3df23..5d928b4 100644
--- a/java/com/android/dialer/precall/impl/CallingAccountSelector.java
+++ b/java/com/android/dialer/precall/impl/CallingAccountSelector.java
@@ -54,6 +54,7 @@
 import com.android.dialer.preferredsim.PreferredSimFallbackContract.PreferredSim;
 import com.android.dialer.preferredsim.suggestion.SimSuggestionComponent;
 import com.android.dialer.preferredsim.suggestion.SuggestionProvider.Suggestion;
+import com.android.dialer.telecom.TelecomUtil;
 import com.google.common.base.Optional;
 import java.util.ArrayList;
 import java.util.List;
@@ -87,6 +88,17 @@
     if (accounts.size() <= 1) {
       return false;
     }
+
+    if (TelecomUtil.isInManagedCall(context)) {
+      // Most devices are DSDS (dual SIM dual standby) which only one SIM can have active calls at
+      // a time. Telecom will ignore the phone account handle and use the current active SIM, thus
+      // there's no point of selecting SIMs
+      // TODO(a bug): let the user know selections are not available and preferred SIM is not
+      // used
+      // TODO(twyen): support other dual SIM modes when the API is exposed.
+      return false;
+    }
+
     return true;
   }
 

java/com/android/incallui/CallButtonPresenter.java

diff --git a/java/com/android/incallui/CallButtonPresenter.java b/java/com/android/incallui/CallButtonPresenter.java
index 6b7eb9b..bd3ba6d 100644
--- a/java/com/android/incallui/CallButtonPresenter.java
+++ b/java/com/android/incallui/CallButtonPresenter.java
@@ -464,7 +464,11 @@
             && call.getState() != DialerCall.State.CONNECTING;
 
     mOtherAccount = TelecomUtil.getOtherAccount(getContext(), call.getAccountHandle());
-    boolean showSwapSim = mOtherAccount != null && DialerCall.State.isDialing(call.getState());
+    boolean showSwapSim =
+        mOtherAccount != null
+            && DialerCall.State.isDialing(call.getState())
+            // Most devices cannot make calls on 2 SIMs at the same time.
+            && InCallPresenter.getInstance().getCallList().getAllCalls().size() == 1;
 
     mInCallButtonUi.showButton(InCallButtonIds.BUTTON_AUDIO, true);
     mInCallButtonUi.showButton(InCallButtonIds.BUTTON_SWAP, showSwap);