diff options
| -rw-r--r-- | InCallUI/src/com/android/incallui/CallList.java | 3 | ||||
| -rw-r--r-- | InCallUI/src/com/android/incallui/InCallActivity.java | 7 |
2 files changed, 8 insertions, 2 deletions
diff --git a/InCallUI/src/com/android/incallui/CallList.java b/InCallUI/src/com/android/incallui/CallList.java index 0927adc07..a3fa58dfd 100644 --- a/InCallUI/src/com/android/incallui/CallList.java +++ b/InCallUI/src/com/android/incallui/CallList.java @@ -438,7 +438,8 @@ public class CallList implements InCallPhoneListener { break; case DisconnectCause.INCOMING_REJECTED: case DisconnectCause.INCOMING_MISSED: - // no delay for missed/rejected incoming calls + case DisconnectCause.OUTGOING_CANCELED: + // no delay for missed/rejected incoming calls and canceled outgoing calls. delay = 0; break; default: diff --git a/InCallUI/src/com/android/incallui/InCallActivity.java b/InCallUI/src/com/android/incallui/InCallActivity.java index c3dc72757..a49342e0e 100644 --- a/InCallUI/src/com/android/incallui/InCallActivity.java +++ b/InCallUI/src/com/android/incallui/InCallActivity.java @@ -670,12 +670,17 @@ public class InCallActivity extends Activity { case DisconnectCause.CS_RESTRICTED_NORMAL: return R.string.callFailed_dsac_restricted_normal; case DisconnectCause.OUTGOING_FAILURE: - case DisconnectCause.OUTGOING_CANCELED: // We couldn't successfully place the call; there was some // failure in the telephony layer. // TODO: Need UI spec for this failure case; for now just // show a generic error. return R.string.incall_error_call_failed; + case DisconnectCause.OUTGOING_CANCELED: + // We don't want to show any dialog for the canceled case since the call was + // either canceled by the user explicitly (end-call button pushed immediately) + // or some other app canceled the call and immediately issued a new CALL to + // replace it. + return INVALID_RES_ID; case DisconnectCause.POWER_OFF: // Radio is explictly powered off, presumably because the // device is in airplane mode. |