From 38e0ed4c08726d20f3ab68da0328b0ca8bb92ec7 Mon Sep 17 00:00:00 2001
From: erfanian <erfanian@google.com>
Date: Mon, 25 Jun 2018 15:24:07 -0700
Subject: Add background call checks.

Bug: 110173835
Test: unit
PiperOrigin-RevId: 202029563
Change-Id: I62021e0f68beb6eff52b475626c40876daf53fbf
---
 java/com/android/incallui/InCallActivity.java | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'java/com')

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);
     }
 
-- 
cgit v1.2.3