summaryrefslogtreecommitdiff
path: root/InCallUI
diff options
context:
space:
mode:
authorTyler Gunn <tgunn@google.com>2014-10-07 20:51:53 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-07 20:51:53 +0000
commit24481e8c0bf51f082888adc4e32d43a6111d9fc2 (patch)
treeed82c273c9de65e26e06d026e50097a2eaac900f /InCallUI
parent09bfb49b8a3eccc90b5e85a80c3511a5abfca7f3 (diff)
parent8ecbd37d8681495a1ee806643665f8feda330f93 (diff)
am 8ee6fb47: Merge "Fixing where call goes from disconnecting to active to disconnecting state." into lmp-dev
* commit '8ee6fb471171741d574feef4d68d504accd5a038': Fixing where call goes from disconnecting to active to disconnecting state.
Diffstat (limited to 'InCallUI')
-rw-r--r--InCallUI/src/com/android/incallui/Call.java2
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;
}