summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--java/com/android/incallui/InCallActivity.java10
1 files changed, 10 insertions, 0 deletions
diff --git a/java/com/android/incallui/InCallActivity.java b/java/com/android/incallui/InCallActivity.java
index 82139e2c3..9db42d75f 100644
--- a/java/com/android/incallui/InCallActivity.java
+++ b/java/com/android/incallui/InCallActivity.java
@@ -1293,6 +1293,16 @@ public class InCallActivity extends TransactionSafeFragmentActivity
: CallList.getInstance().getActiveCall();
if (call == null) {
+ // This is a special case where the first call is not automatically resumed
+ // after the second active call is remotely disconnected.
+ DialerCall backgroundCall = CallList.getInstance().getBackgroundCall();
+ if (backgroundCall != null && backgroundCall.isSpeakEasyCall()) {
+ LogUtil.i("InCallActivity.getShouldShowSpeakEasyUi", "taking call off hold");
+
+ backgroundCall.unhold();
+ return new ShouldShowUiResult(true, backgroundCall);
+ }
+
return new ShouldShowUiResult(false, call);
}