diff options
author | Tyler Gunn <tgunn@google.com> | 2014-10-07 21:00:47 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-07 21:00:47 +0000 |
commit | 9168f7f9eab61dbf5dcd608f8e7d3dbdf1866a79 (patch) | |
tree | ed82c273c9de65e26e06d026e50097a2eaac900f | |
parent | 72f1bcf77d3b200124e72e20aaec64447a054c1f (diff) | |
parent | 24481e8c0bf51f082888adc4e32d43a6111d9fc2 (diff) |
am 1a0c170c: am 8ee6fb47: Merge "Fixing where call goes from disconnecting to active to disconnecting state." into lmp-dev
* commit '1a0c170c77c2eb6f87e4606d7186c02ca917c8d4':
Fixing where call goes from disconnecting to active to disconnecting state.
-rw-r--r-- | InCallUI/src/com/android/incallui/Call.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/InCallUI/src/com/android/incallui/Call.java b/InCallUI/src/com/android/incallui/Call.java index 45a753f10..c36e74bac 100644 --- a/InCallUI/src/com/android/incallui/Call.java +++ b/InCallUI/src/com/android/incallui/Call.java @@ -242,6 +242,8 @@ public final class Call { return Call.State.ONHOLD; case android.telecom.Call.STATE_DISCONNECTED: return Call.State.DISCONNECTED; + case android.telecom.Call.STATE_DISCONNECTING: + return Call.State.DISCONNECTING; default: return Call.State.INVALID; } |