diff options
| author | Yorke Lee <yorkelee@google.com> | 2015-05-11 20:58:55 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-11 20:58:55 +0000 |
| commit | c6e19b07fa3c2ba480066607538d94561c77eb14 (patch) | |
| tree | 6b46d6ab288bc51f0d91e94cf5f59616a299245d /InCallUI | |
| parent | d58cac222ad0f3fcdb71a89b04759b631c6ebd8f (diff) | |
| parent | 7db97b190a4192a6b0a7305b6c055c0f546845d6 (diff) | |
am 7136e2af: Merge "Show end call button for disconnecting calls" into mnc-dev
* commit '7136e2af0406ec86a551dd790d3a5b1a96269c2d':
Show end call button for disconnecting calls
Diffstat (limited to 'InCallUI')
| -rw-r--r-- | InCallUI/src/com/android/incallui/CallCardPresenter.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/InCallUI/src/com/android/incallui/CallCardPresenter.java b/InCallUI/src/com/android/incallui/CallCardPresenter.java index eed92cf59..6b3ee812d 100644 --- a/InCallUI/src/com/android/incallui/CallCardPresenter.java +++ b/InCallUI/src/com/android/incallui/CallCardPresenter.java @@ -804,7 +804,8 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi> if (primary == null) { return false; } - if (!Call.State.isConnectingOrConnected(callState) || callState == Call.State.INCOMING) { + if ((!Call.State.isConnectingOrConnected(callState) + && callState != Call.State.DISCONNECTING) || callState == Call.State.INCOMING) { return false; } if (mPrimary.getSessionModificationState() |