summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSantos Cordon <santoscordon@google.com>2013-11-21 14:49:27 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-11-21 14:49:27 -0800
commitdf4b76e8161eab4908dfa9b25d446272fd7a004e (patch)
treebfb6611dc543e9df46180dc481a349f1b60b9048
parent5ac3273d5bd41da8e68f54f45244c817c2aec716 (diff)
parent217454bafc9ccf8ebd02f74bcd7cffec7bac8a9d (diff)
am 179eb7ca: am 4a2cf432: am 439ddb20: am 59dc0b9d: Merge "Decrease the timeout for unknown endcall screen from 5 to 2 sec." into klp-dev
* commit '179eb7cadb62dc24b9ae4ba18f50c60c3b54c4a0': Decrease the timeout for unknown endcall screen from 5 to 2 sec.
-rw-r--r--InCallUI/src/com/android/incallui/CallList.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/InCallUI/src/com/android/incallui/CallList.java b/InCallUI/src/com/android/incallui/CallList.java
index 125ec164d..e8edc4d35 100644
--- a/InCallUI/src/com/android/incallui/CallList.java
+++ b/InCallUI/src/com/android/incallui/CallList.java
@@ -25,6 +25,7 @@ import android.os.Handler;
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 @@ public class CallList {
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 @@ public class CallList {
delay = DISCONNECTED_CALL_SHORT_TIMEOUT_MS;
break;
case NORMAL:
+ case UNKNOWN:
delay = DISCONNECTED_CALL_MEDIUM_TIMEOUT_MS;
break;
case INCOMING_REJECTED: