diff options
author | Anders Kristensen <andersk@google.com> | 2014-02-27 14:26:43 -0800 |
---|---|---|
committer | Anders Kristensen <andersk@google.com> | 2014-03-28 17:13:34 +0000 |
commit | a81667248196be225849f7739f64752dc578f6bb (patch) | |
tree | 8f37c7eb86c8debb2e32e2c345cedcc20b40726e /src/com/android/incallui/CallList.java | |
parent | cd29be4cd60d6818b58a5927d452aaf52da43f6b (diff) | |
download | packages_apps_InCallUI-a81667248196be225849f7739f64752dc578f6bb.tar.gz packages_apps_InCallUI-a81667248196be225849f7739f64752dc578f6bb.tar.bz2 packages_apps_InCallUI-a81667248196be225849f7739f64752dc578f6bb.zip |
Remove duplicate call disconnect codes.
The Android code base defines call disconnect codes in three places:
- android.telephony.DisconnectCause
- android.internal.telephony.Connection.DisconnectCause
- com.android.services.telephony.common.Call.DisconnectCause
This CL consolidates the code to use the integer codes from
android.telephony.DisconnectCause everywhere.
Change-Id: I84a3fd5182a51d07fc7d81076e4b2c15ff26c61c
Diffstat (limited to 'src/com/android/incallui/CallList.java')
-rw-r--r-- | src/com/android/incallui/CallList.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/com/android/incallui/CallList.java b/src/com/android/incallui/CallList.java index ba123b0c..4c43db7b 100644 --- a/src/com/android/incallui/CallList.java +++ b/src/com/android/incallui/CallList.java @@ -23,6 +23,7 @@ import com.google.common.base.Preconditions; import android.os.Handler; import android.os.Message; +import android.telephony.DisconnectCause; import com.android.services.telephony.common.Call; @@ -373,17 +374,17 @@ public class CallList { Preconditions.checkState(call.getState() == Call.State.DISCONNECTED); - final Call.DisconnectCause cause = call.getDisconnectCause(); + final int cause = call.getDisconnectCause(); final int delay; switch (cause) { - case LOCAL: + case DisconnectCause.LOCAL: delay = DISCONNECTED_CALL_SHORT_TIMEOUT_MS; break; - case NORMAL: + case DisconnectCause.NORMAL: delay = DISCONNECTED_CALL_MEDIUM_TIMEOUT_MS; break; - case INCOMING_REJECTED: - case INCOMING_MISSED: + case DisconnectCause.INCOMING_REJECTED: + case DisconnectCause.INCOMING_MISSED: // no delay for missed/rejected incoming calls delay = 0; break; |