diff options
| author | yueg <yueg@google.com> | 2017-07-17 16:28:07 -0700 |
|---|---|---|
| committer | Eric Erfanian <erfanian@google.com> | 2017-07-25 16:41:39 +0000 |
| commit | 3b232751f69e028d7825efb7e6513045babd0ebb (patch) | |
| tree | b9184f5b847f8a26684abbffa56955d85c937b4a /java | |
| parent | fab1c8bd31a3871d466e4c3d24a4d90fcb25564c (diff) | |
Fix bubble for video call upgrade and multiple voice call.
To make sure bubble is dismissed on video call connected but isn't dismissed on
non-last multiple voice call disconnected.
Receive upgrade, declined and accepted:
https://drive.google.com/a/google.com/file/d/0Bz1rQbdSCWSKMFc4aDRFdi1xYTQ
Request upgrade, declined and accepted:
https://drive.google.com/a/google.com/file/d/0Bz1rQbdSCWSKelZZSURwTjBiYnM
Multiple voice call:
https://drive.google.com/a/google.com/file/d/0Bz1rQbdSCWSKNEhNWGdzWFAtTlE
Test: manual
PiperOrigin-RevId: 162288587
Change-Id: Idfa8efa3eb96980ab17694b8fe4d31fa8eb3e18d
Diffstat (limited to 'java')
| -rw-r--r-- | java/com/android/incallui/ReturnToCallController.java | 10 |
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 |