commit f2950041843dfc3c1f1d42db4b2652933e58bdf0
author Santos Cordon <santoscordon@google.com> Tue Nov 19 19:56:16 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 19 19:56:16 2013 +0000
tree eb210f42ca9189af7e3e2ce61d0761b085259bdc
parent b48cecbe68abbecd15991b4476a5304ee8f38bcd
parent eb857b7f5fe3bef77dde91693f18cabd8c6d15d5

Merge "Decrease the timeout for unknown endcall screen from 5 to 2 sec." into klp-dev

InCallUI/src/com/android/incallui/CallList.java

diff --git a/InCallUI/src/com/android/incallui/CallList.java b/InCallUI/src/com/android/incallui/CallList.java
index ba123b0..dee2755 100644
--- a/InCallUI/src/com/android/incallui/CallList.java
+++ b/InCallUI/src/com/android/incallui/CallList.java
@@ -25,6 +25,7 @@
 import android.os.Message;
 
 import com.android.services.telephony.common.Call;
+import com.android.services.telephony.common.Call.DisconnectCause;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -310,7 +311,9 @@
             if (state != Call.State.IDLE &&
                     state != Call.State.INVALID &&
                     state != Call.State.DISCONNECTED) {
+
                 call.setState(Call.State.DISCONNECTED);
+                call.setDisconnectCause(DisconnectCause.UNKNOWN);
                 updateCallInMap(call);
             }
         }
@@ -380,6 +383,7 @@
                 delay = DISCONNECTED_CALL_SHORT_TIMEOUT_MS;
                 break;
             case NORMAL:
+            case UNKNOWN:
                 delay = DISCONNECTED_CALL_MEDIUM_TIMEOUT_MS;
                 break;
             case INCOMING_REJECTED: