diff options
| author | Qi Wang <wangqi@google.com> | 2016-03-01 18:35:44 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-03-01 18:35:44 +0000 |
| commit | 008c82f409bc9b12cc1752e6e24168e8a0121af6 (patch) | |
| tree | 7b90d8af811f5d3c241927689131e57304c9205b /InCallUI/src/com/android/incallui/CallCardPresenter.java | |
| parent | af5880f151fbcda28dcb16f59c040b96fa4807d9 (diff) | |
| parent | 8cc908aef3668de57a3991438e03c3863a4160d8 (diff) | |
Merge "Fix bug of secondary call info disappear after switching calls." into nyc-dev
Diffstat (limited to 'InCallUI/src/com/android/incallui/CallCardPresenter.java')
| -rw-r--r-- | InCallUI/src/com/android/incallui/CallCardPresenter.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/InCallUI/src/com/android/incallui/CallCardPresenter.java b/InCallUI/src/com/android/incallui/CallCardPresenter.java index bf7b4769b..00835c8ce 100644 --- a/InCallUI/src/com/android/incallui/CallCardPresenter.java +++ b/InCallUI/src/com/android/incallui/CallCardPresenter.java @@ -697,6 +697,13 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi> return retval; } + // Sometimes there is intemediate state that two calls are in active even one is about + // to be on hold. + retval = callList.getSecondActiveCall(); + if (retval != null && retval != ignore) { + return retval; + } + // Disconnected calls get primary position if there are no active calls // to let user know quickly what call has disconnected. Disconnected // calls are very short lived. |