diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-10-21 10:55:33 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-21 10:55:33 -0700 |
| commit | 164cd438fb21e82d0aacc06da940041f0b7f6a2c (patch) | |
| tree | 2d96f18584c7c773ce949e8d47192a45b24b767f /telephony | |
| parent | 4ef36afa3273bc15a59c3262e41e61d7ccba6c3e (diff) | |
| parent | 5102856947595cffc1cceb11b9e4c5baf70b2e82 (diff) | |
| download | frameworks_base-164cd438fb21e82d0aacc06da940041f0b7f6a2c.zip frameworks_base-164cd438fb21e82d0aacc06da940041f0b7f6a2c.tar.gz frameworks_base-164cd438fb21e82d0aacc06da940041f0b7f6a2c.tar.bz2 | |
am 51028569: am 1180f2a0: Merge "Remove ringtone API from SipAudioCall." into gingerbread
Merge commit '5102856947595cffc1cceb11b9e4c5baf70b2e82'
* commit '5102856947595cffc1cceb11b9e4c5baf70b2e82':
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 00ae80f..a25b3ca 100755 --- a/telephony/java/com/android/internal/telephony/sip/SipPhone.java +++ b/telephony/java/com/android/internal/telephony/sip/SipPhone.java @@ -717,7 +717,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); } |