summaryrefslogtreecommitdiff
path: root/InCallUI
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2015-05-12 23:12:33 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-05-12 23:12:33 +0000
commit69267671fe93af89fac55aa2da75cbd526f452e9 (patch)
tree1f781b4d07d61554570500f9e8715e1e4001aa9a /InCallUI
parent27979cf316790d4da47c1967a2920a43ee6086e5 (diff)
parent27706bf46c5d1872cc3c6c58e9d5fa255529c2ee (diff)
am e116d3a3: Merge "Finish InCallActivity immediately for DisconnectCause.ERROR" into mnc-dev
* commit 'e116d3a38709117bf2006b78535d12b1d31a24b0': Finish InCallActivity immediately for DisconnectCause.ERROR
Diffstat (limited to 'InCallUI')
-rw-r--r--InCallUI/src/com/android/incallui/CallList.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/InCallUI/src/com/android/incallui/CallList.java b/InCallUI/src/com/android/incallui/CallList.java
index bec81ec57..5d38e2477 100644
--- a/InCallUI/src/com/android/incallui/CallList.java
+++ b/InCallUI/src/com/android/incallui/CallList.java
@@ -469,6 +469,7 @@ public class CallList {
case DisconnectCause.REMOTE:
delay = DISCONNECTED_CALL_MEDIUM_TIMEOUT_MS;
break;
+ case DisconnectCause.ERROR:
case DisconnectCause.REJECTED:
case DisconnectCause.MISSED:
case DisconnectCause.CANCELED: