diff options
| author | yueg <yueg@google.com> | 2017-07-12 18:42:58 -0700 |
|---|---|---|
| committer | Eric Erfanian <erfanian@google.com> | 2017-07-24 18:47:54 +0000 |
| commit | 85c793406262562f940d46076a99515975b74910 (patch) | |
| tree | 668dafbc7a9c978fb81ca91781b4b3651252ad50 /java | |
| parent | 540a0af54fb2c18cb046286a323b9aa7b8a68e28 (diff) | |
Fix bubble for video call upgrade.
Bubble showed call ended text and didn't dismiss when requesting/receiving video call upgrade. Fix it by showing text only when call is really disconnected and always hiding.
Request upgrade, declined and then accepted:
https://drive.google.com/a/google.com/file/d/0Bz1rQbdSCWSKZURkNWVOMnNnZHc
Receive upgrade, declined and then accepted:
https://drive.google.com/a/google.com/file/d/0Bz1rQbdSCWSKWGhJbi1uR004REE
Test: manual
PiperOrigin-RevId: 161750763
Change-Id: Iefb58edfbfffc33ee5231ef4928f31202e2880f4
Diffstat (limited to 'java')
| -rw-r--r-- | java/com/android/incallui/ReturnToCallController.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/java/com/android/incallui/ReturnToCallController.java b/java/com/android/incallui/ReturnToCallController.java index 33154c5cf..57d50adb2 100644 --- a/java/com/android/incallui/ReturnToCallController.java +++ b/java/com/android/incallui/ReturnToCallController.java @@ -134,13 +134,11 @@ public class ReturnToCallController implements InCallUiListener, Listener, Audio @Override public void onDisconnect(DialerCall call) { - if (bubble != null && bubble.isVisible()) { + if (bubble != null && bubble.isVisible() && !TelecomUtil.isInCall(context)) { bubble.showText(context.getText(R.string.incall_call_ended)); } - if (!TelecomUtil.isInCall(context)) { - hide(); - } + hide(); } @Override |