diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-03-30 21:05:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-03-30 21:05:14 +0000 |
| commit | 4db53d0caeca0350915fefa1041daccf0ed0f806 (patch) | |
| tree | 1ff4ab39241c91c6ae4a8abad8208ed9f2ce1ee8 /java/com/android/incallui | |
| parent | 0fd0f1e8a67b11c34c7b28f19b82642cb3d3c5a1 (diff) | |
| parent | c6d218612513ca3bcc78aa1201f6e4ec576742bd (diff) | |
Merge "Fix bubble showing after dismiss bug."
Diffstat (limited to 'java/com/android/incallui')
| -rw-r--r-- | java/com/android/incallui/ReturnToCallController.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/java/com/android/incallui/ReturnToCallController.java b/java/com/android/incallui/ReturnToCallController.java index d5e6a1001..0850e913a 100644 --- a/java/com/android/incallui/ReturnToCallController.java +++ b/java/com/android/incallui/ReturnToCallController.java @@ -92,10 +92,10 @@ public class ReturnToCallController implements InCallUiListener, Listener, Audio endCall = createActionIntent(ReturnToCallActionReceiver.ACTION_END_CALL); fullScreen = createActionIntent(ReturnToCallActionReceiver.ACTION_RETURN_TO_CALL); - InCallPresenter.getInstance().addInCallUiListener(this); - CallList.getInstance().addListener(this); AudioModeProvider.getInstance().addListener(this); audioState = AudioModeProvider.getInstance().getAudioState(); + InCallPresenter.getInstance().addInCallUiListener(this); + CallList.getInstance().addListener(this); } public void tearDown() { @@ -186,7 +186,7 @@ public class ReturnToCallController implements InCallUiListener, Listener, Audio return; } - if ((bubble == null || !bubble.isVisible()) + if ((bubble == null || !(bubble.isVisible() || bubble.isDismissed())) && getCall() != null && !InCallPresenter.getInstance().isShowingInCallUi()) { LogUtil.i("ReturnToCallController.onCallListChange", "going to show bubble"); |