| commit | 3b232751f69e028d7825efb7e6513045babd0ebb | [log] [tgz] |
|---|---|---|
| author | yueg <yueg@google.com> | Mon Jul 17 16:28:07 2017 -0700 |
| committer | Eric Erfanian <erfanian@google.com> | Tue Jul 25 16:41:39 2017 +0000 |
| tree | b9184f5b847f8a26684abbffa56955d85c937b4a | |
| 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
diff --git a/java/com/android/incallui/ReturnToCallController.java b/java/com/android/incallui/ReturnToCallController.java index 57d50ad..978b140 100644 --- a/java/com/android/incallui/ReturnToCallController.java +++ b/java/com/android/incallui/ReturnToCallController.java
@@ -134,11 +134,15 @@ @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