diff options
author | Yorke Lee <yorkelee@google.com> | 2015-05-11 20:47:08 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-11 20:47:09 +0000 |
commit | 7db97b190a4192a6b0a7305b6c055c0f546845d6 (patch) | |
tree | 8009a990d2c2c7b63a8988e7204b6b79b629e6ab /InCallUI | |
parent | df3ef3fc3d10573507c6451bffd1f55dfcb475dd (diff) | |
parent | 4c058612097eba72b33d83f5612012a90167957a (diff) |
Merge "Show end call button for disconnecting calls" into mnc-dev
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() |