diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-07-22 19:57:21 -0700 |
|---|---|---|
| committer | Hung-ying Tyan <tyanh@google.com> | 2010-07-23 10:07:03 -0700 |
| commit | ef5ec9ddc4b4794b7cf83fe78b63d18c0674319f (patch) | |
| tree | 494287527f5ba7492e30b3d0580a9856d5473928 | |
| parent | 7dd865927d6eadd27c9f54eec96a6d8212067170 (diff) | |
| download | nist-sip-ef5ec9ddc4b4794b7cf83fe78b63d18c0674319f.tar.gz | |
SIP telephony: clean up TODO's. B)
Change-Id: I5e29b989912c6690c543b45038300991d1ae6d4a
| -rw-r--r-- | phone/src2/com/android/internal/telephony/sip/SipConnectionBase.java | 1 | ||||
| -rwxr-xr-x | phone/src2/com/android/internal/telephony/sip/SipPhone.java | 10 |
2 files changed, 1 insertions, 10 deletions
diff --git a/phone/src2/com/android/internal/telephony/sip/SipConnectionBase.java b/phone/src2/com/android/internal/telephony/sip/SipConnectionBase.java index 9bd9622..8ebc3a3 100644 --- a/phone/src2/com/android/internal/telephony/sip/SipConnectionBase.java +++ b/phone/src2/com/android/internal/telephony/sip/SipConnectionBase.java @@ -43,7 +43,6 @@ abstract class SipConnectionBase extends Connection { private SipAudioCall mSipAudioCall; - // TODO private String mAddress = null; // MAY BE NULL!!! private String dialString; // outgoing calls only private String postDialString; // outgoing calls only diff --git a/phone/src2/com/android/internal/telephony/sip/SipPhone.java b/phone/src2/com/android/internal/telephony/sip/SipPhone.java index 382d5cd..44452fe 100755 --- a/phone/src2/com/android/internal/telephony/sip/SipPhone.java +++ b/phone/src2/com/android/internal/telephony/sip/SipPhone.java @@ -183,8 +183,6 @@ public class SipPhone extends SipPhoneBase { } if (foregroundCall.getState() == SipCall.State.ACTIVE) { switchHoldingAndActive(); - // TODO: - //fakeHoldForegroundBeforeDial(); } if (foregroundCall.getState() != SipCall.State.IDLE) { //we should have failed in !canDial() above before we get here @@ -212,9 +210,7 @@ public class SipPhone extends SipPhoneBase { } public boolean canConference() { - //TODO - //return mCT.canConference(); - return false; + return true; } public void conference() throws CallStateException { @@ -222,8 +218,6 @@ public class SipPhone extends SipPhoneBase { } public boolean canTransfer() { - // TODO - //return mCT.canTransfer(); return false; } @@ -362,8 +356,6 @@ public class SipPhone extends SipPhoneBase { } } - // TODO: if this is the foreground call and a background call exists, - // resume the background call @Override public void hangup() throws CallStateException { Log.v(LOG_TAG, "hang up call: " + getState() + ": " + this |