diff options
| author | Yorke Lee <yorkelee@google.com> | 2015-09-25 21:31:08 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-09-25 21:31:08 +0000 |
| commit | 25e66650e8c4dc55b8fb53b07f3e28fb7e14619d (patch) | |
| tree | 167370ceca17f5e031075ba1e4a02d06e50e704f /InCallUI | |
| parent | 0b81bb2cf3c3eb736e8f692a1fd68fb2d3c47742 (diff) | |
| parent | 22d1d3e60416012eafdf57ad0ea63a576a4c9b6e (diff) | |
Merge "Show InCallUI for all PENDING_OUTGOING -> INCALL transitions" into ub-contactsdialer-a-dev
Diffstat (limited to 'InCallUI')
| -rw-r--r-- | InCallUI/src/com/android/incallui/InCallPresenter.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/InCallUI/src/com/android/incallui/InCallPresenter.java b/InCallUI/src/com/android/incallui/InCallPresenter.java index 83f7ae0d7..032d096f8 100644 --- a/InCallUI/src/com/android/incallui/InCallPresenter.java +++ b/InCallUI/src/com/android/incallui/InCallPresenter.java @@ -1079,7 +1079,7 @@ public class InCallPresenter implements CallList.Listener, // Direct transition from PENDING_OUTGOING -> INCALL means that there was an error in the // outgoing call process, so the UI should be brought up to show an error dialog. showCallUi |= (InCallState.PENDING_OUTGOING == mInCallState - && InCallState.INCALL == newState && !isActivityStarted()); + && InCallState.INCALL == newState && !isShowingInCallUi()); // Another exception - InCallActivity is in charge of disconnecting a call with no // valid accounts set. Bring the UI up if this is true for the current pending outgoing |