diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-10-20 13:54:25 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-20 13:54:25 -0700 |
| commit | 5102856947595cffc1cceb11b9e4c5baf70b2e82 (patch) | |
| tree | b9b445663342cedd9fe58857a1f69fd48999092e /telephony | |
| parent | 18cbc0e58a0e68411dff655f116a7010c3f464a2 (diff) | |
| parent | 1180f2a099a134c40f923c7e4162a5e7d7ca0184 (diff) | |
| download | frameworks_base-5102856947595cffc1cceb11b9e4c5baf70b2e82.zip frameworks_base-5102856947595cffc1cceb11b9e4c5baf70b2e82.tar.gz frameworks_base-5102856947595cffc1cceb11b9e4c5baf70b2e82.tar.bz2 | |
am 1180f2a0: Merge "Remove ringtone API from SipAudioCall." into gingerbread
Merge commit '1180f2a099a134c40f923c7e4162a5e7d7ca0184' into gingerbread-plus-aosp
* commit '1180f2a099a134c40f923c7e4162a5e7d7ca0184':
Remove ringtone API from SipAudioCall.
Diffstat (limited to 'telephony')
| -rwxr-xr-x | telephony/java/com/android/internal/telephony/sip/SipPhone.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/telephony/java/com/android/internal/telephony/sip/SipPhone.java b/telephony/java/com/android/internal/telephony/sip/SipPhone.java index b9a2e60..8f3c458 100755 --- a/telephony/java/com/android/internal/telephony/sip/SipPhone.java +++ b/telephony/java/com/android/internal/telephony/sip/SipPhone.java @@ -714,7 +714,6 @@ public class SipPhone extends SipPhoneBase { setState(Call.State.DIALING); mSipAudioCall = mSipManager.makeAudioCall(mProfile, mPeer, null, TIMEOUT_MAKE_CALL); - mSipAudioCall.setRingbackToneEnabled(false); mSipAudioCall.setListener(mAdapter); } |