summaryrefslogtreecommitdiffstats
path: root/telephony
diff options
context:
space:
mode:
authorHung-ying Tyan <tyanh@google.com>2010-08-09 22:37:46 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-09 22:37:46 -0700
commitf13542f2eba27d9b09ba6aa313f758e5518caa00 (patch)
tree2b40ae94c3a8aeb4c1c3a8891282c78279de61ff /telephony
parent4a671a745202cb15cc668d46400731a03b068558 (diff)
parent259b4c860212dd528b25d1cce6e74be01afed85c (diff)
downloadframeworks_base-f13542f2eba27d9b09ba6aa313f758e5518caa00.zip
frameworks_base-f13542f2eba27d9b09ba6aa313f758e5518caa00.tar.gz
frameworks_base-f13542f2eba27d9b09ba6aa313f758e5518caa00.tar.bz2
am 259b4c86: Merge "SIP: clean up unused class and fields." into gingerbread
Merge commit '259b4c860212dd528b25d1cce6e74be01afed85c' into gingerbread-plus-aosp * commit '259b4c860212dd528b25d1cce6e74be01afed85c': SIP: clean up unused class and fields.
Diffstat (limited to 'telephony')
-rwxr-xr-xtelephony/java/com/android/internal/telephony/sip/SipPhone.java2
1 files changed, 0 insertions, 2 deletions
diff --git a/telephony/java/com/android/internal/telephony/sip/SipPhone.java b/telephony/java/com/android/internal/telephony/sip/SipPhone.java
index 4e61d30..edc1f8a 100755
--- a/telephony/java/com/android/internal/telephony/sip/SipPhone.java
+++ b/telephony/java/com/android/internal/telephony/sip/SipPhone.java
@@ -74,8 +74,6 @@ public class SipPhone extends SipPhoneBase {
private static final String LOG_TAG = "SipPhone";
private static final boolean LOCAL_DEBUG = true;
- //private List<SipConnection> connections = new ArrayList<SipConnection>();
-
// A call that is ringing or (call) waiting
private SipCall ringingCall = new SipCall();
private SipCall foregroundCall = new SipCall();