diff options
author | Yorke Lee <yorkelee@google.com> | 2014-09-27 20:23:13 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-27 20:23:13 +0000 |
commit | 838b8ed7a5f84da95dc7042cdfc0123c734d5303 (patch) | |
tree | be4ce7afed9f502dcf5d0bd715625ff302928bc9 /InCallUI | |
parent | 07ad70374ebc09d9b0ea3eafc2300a1ff6f1c34d (diff) | |
parent | 58759abe8d9786186608377a55f35ec3d14bb989 (diff) |
am 63c85b7b: Merge "Fix for not being able to return to InCallUI after accepting call via BT" into lmp-dev
* commit '63c85b7bbe13b6beea0355c5ee08790fa0284ce0':
Fix for not being able to return to InCallUI after accepting call via BT
Diffstat (limited to 'InCallUI')
-rw-r--r-- | InCallUI/src/com/android/incallui/InCallPresenter.java | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/InCallUI/src/com/android/incallui/InCallPresenter.java b/InCallUI/src/com/android/incallui/InCallPresenter.java index aa9cc744c..6f3d1b399 100644 --- a/InCallUI/src/com/android/incallui/InCallPresenter.java +++ b/InCallUI/src/com/android/incallui/InCallPresenter.java @@ -631,11 +631,13 @@ public class InCallPresenter implements CallList.Listener, InCallPhoneListener { */ public void bringToForeground(boolean showDialpad) { // Before we bring the incall UI to the foreground, we check to see if: - // 1. We've already started the activity once for this session - // 2. If it exists, the activity is not already in the foreground - // 3. We are in a state where we want to show the incall ui - if (mIsActivityPreviouslyStarted && !isShowingInCallUi() && - mInCallState != InCallState.NO_CALLS) { + // 1. It is not currently in the foreground + // 2. We are in a state where we want to show the incall ui (i.e. there are calls to + // be displayed) + // If the activity hadn't actually been started previously, yet there are still calls + // present (e.g. a call was accepted by a bluetooth or wired headset), we want to + // bring it up the UI regardless. + if (!isShowingInCallUi() && mInCallState != InCallState.NO_CALLS) { showInCall(showDialpad, false /* newOutgoingCall */); } } |