summaryrefslogtreecommitdiff
path: root/java/com/android
diff options
context:
space:
mode:
Diffstat (limited to 'java/com/android')
-rw-r--r--java/com/android/incallui/ReturnToCallController.java10
1 files changed, 7 insertions, 3 deletions
diff --git a/java/com/android/incallui/ReturnToCallController.java b/java/com/android/incallui/ReturnToCallController.java
index 57d50adb2..978b14039 100644
--- a/java/com/android/incallui/ReturnToCallController.java
+++ b/java/com/android/incallui/ReturnToCallController.java
@@ -134,11 +134,15 @@ public class ReturnToCallController implements InCallUiListener, Listener, Audio
@Override
public void onDisconnect(DialerCall call) {
- if (bubble != null && bubble.isVisible() && !TelecomUtil.isInCall(context)) {
+ boolean hasAnotherCall = CallList.getInstance().getActiveOrBackgroundCall() != null;
+ if (bubble != null
+ && bubble.isVisible()
+ && (!TelecomUtil.isInCall(context) || hasAnotherCall)) {
bubble.showText(context.getText(R.string.incall_call_ended));
}
-
- hide();
+ if (!hasAnotherCall) {
+ hide();
+ }
}
@Override