commit 7962e6910490286117c6b5a55550313dc7e5815c
author Santos Cordon <santoscordon@google.com> Tue Nov 19 12:02:48 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Nov 19 12:02:48 2013 -0800
tree 1e95cb4b0b70723f78e7c8b75f5c707e2351a5d2
parent accdc08ac945fdf26410fae03e161715b348f01b
parent 805e2bfefba9d8819244fe0783f70c218fb0fe2d

am 439ddb20: am 59dc0b9d: Merge "Decrease the timeout for unknown endcall screen from 5 to 2 sec." into klp-dev

* commit '439ddb20c5154cd9cea2cfff5bfe6f113b6018dc':
  Decrease the timeout for unknown endcall screen from 5 to 2 sec.

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: