diff options
author | Hung-ying Tyan <tyanh@google.com> | 2010-11-30 22:53:26 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-11-30 22:53:26 -0800 |
commit | d7116ff1f0d1a3c14992273d0b899c3b71ba6d3f (patch) | |
tree | bfc4282afdcc2a14e19d898aa5fd717242264e1c /telephony | |
parent | 04639ba0a939988d00131e61458807dac650f9c3 (diff) | |
parent | 4189d99b6e4877352049b7447b7f0734ef99b9e8 (diff) | |
download | frameworks_base-d7116ff1f0d1a3c14992273d0b899c3b71ba6d3f.zip frameworks_base-d7116ff1f0d1a3c14992273d0b899c3b71ba6d3f.tar.gz frameworks_base-d7116ff1f0d1a3c14992273d0b899c3b71ba6d3f.tar.bz2 |
Merge "Do not suppress error feedback during a SIP call." into gingerbread
Diffstat (limited to 'telephony')
-rwxr-xr-x | telephony/java/com/android/internal/telephony/sip/SipPhone.java | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/telephony/java/com/android/internal/telephony/sip/SipPhone.java b/telephony/java/com/android/internal/telephony/sip/SipPhone.java index 818605a..5cf2531 100755 --- a/telephony/java/com/android/internal/telephony/sip/SipPhone.java +++ b/telephony/java/com/android/internal/telephony/sip/SipPhone.java @@ -656,12 +656,6 @@ public class SipPhone extends SipPhoneBase { @Override protected void onError(DisconnectCause cause) { if (DEBUG) Log.d(LOG_TAG, "SIP error: " + cause); - if (mSipAudioCall.isInCall() - && (cause != DisconnectCause.LOST_SIGNAL)) { - // Don't end the call when in a call. - return; - } - onCallEnded(cause); } }; |