commit c0200c4d60cf662f5e6aa422a810646ff02928b8
author yueg <yueg@google.com> Mon May 07 17:13:13 2018 -0700
committer Copybara-Service <copybara-piper@google.com> Wed May 09 16:54:56 2018 -0700
tree e6a55ee7a9420f90dfbd32818b7e780b0dde1870
parent f0a425e86fa8c234c962718b33682ecd8367ea25

Do not show bubble for outgoing call if it's not a background call.

Test: ReturnToCallControllerTest
PiperOrigin-RevId: 195747611
Change-Id: Ibce7ef45af2f79cc5a35825a2bb38fe268a4681c

java/com/android/incallui/ReturnToCallController.java

diff --git a/java/com/android/incallui/ReturnToCallController.java b/java/com/android/incallui/ReturnToCallController.java
index 96bdda1..7c4585c 100644
--- a/java/com/android/incallui/ReturnToCallController.java
+++ b/java/com/android/incallui/ReturnToCallController.java
@@ -196,12 +196,13 @@
         newInCallState != inCallState
             && newInCallState == InCallState.OUTGOING
             && shouldStartInBubbleMode;
+    boolean bubbleNeverVisible = (bubble == null || !(bubble.isVisible() || bubble.isDismissed()));
     if (bubble != null && isNewBackgroundCall) {
       // If new outgoing call is in bubble mode, update bubble info.
       // We don't update if new call is not in bubble mode even if the existing call is.
       bubble.setBubbleInfo(generateBubbleInfoForBackgroundCalling());
     }
-    if ((bubble == null || !(bubble.isVisible() || bubble.isDismissed()) || isNewBackgroundCall)
+    if (((bubbleNeverVisible && newInCallState != InCallState.OUTGOING) || isNewBackgroundCall)
         && getCall() != null
         && !InCallPresenter.getInstance().isShowingInCallUi()) {
       LogUtil.i("ReturnToCallController.onCallListChange", "going to show bubble");