commit 854224e9d1aaee8bb9a8c065c860012e997d7be0
author Omkar Kolangade <omkark@codeaurora.org> Thu Aug 25 20:51:10 2016 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Sat Aug 27 00:56:41 2016 -0700
tree 287b40f9ef21218495ef34de254d9bbb1f32371c
parent 15a2252ae0c8f29608f9022ad4459d1aba22da13

Revert "Expedite the processing of destroying Incall UI after end call"

This reverts commit 76876caffbb40f4929d62459152a785698ac1540.

This change is causing regression in basic call end scenarios.

Change-Id: I97f6ecc92f3fa816874540664c11ecb66cc39338
CRs-Fixed: 1058473

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 142c9d9..14255cb 100644
--- a/InCallUI/src/com/android/incallui/CallList.java
+++ b/InCallUI/src/com/android/incallui/CallList.java
@@ -538,8 +538,7 @@
 
         boolean updated = false;
 
-        if (call.getState() == Call.State.DISCONNECTING
-                || call.getState() == Call.State.DISCONNECTED) {
+        if (call.getState() == Call.State.DISCONNECTED) {
             // update existing (but do not add!!) disconnected calls
             if (mCallById.containsKey(call.getId())) {
                 // For disconnected calls, we want to keep them alive for a few seconds so that the
@@ -568,8 +567,8 @@
     }
 
     private int getDelayForDisconnect(Call call) {
-        Preconditions.checkState(call.getState() == Call.State.DISCONNECTED
-                || call.getState() == Call.State.DISCONNECTING);
+        Preconditions.checkState(call.getState() == Call.State.DISCONNECTED);
+
 
         final int cause = call.getDisconnectCause().getCode();
         final int delay;
@@ -584,7 +583,6 @@
             case DisconnectCause.REJECTED:
             case DisconnectCause.MISSED:
             case DisconnectCause.CANCELED:
-            case DisconnectCause.UNKNOWN:
                 // no delay for missed/rejected incoming calls and canceled outgoing calls.
                 delay = 0;
                 break;