commit 8fbc471199b157d40d709dbde6ea538a16444cfc
author Hung-ying Tyan <tyanh@google.com> Tue Sep 07 19:43:33 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Sep 07 19:43:33 2010 -0700
tree d8abb4530736fd626f238297f8514c4463c40c69
parent a009dde6f481464fe60e3fca5ead9fcfab03ddcf
parent f870ee81089ddf5e0388f8b4c7b6a1d437d39ce0

am f870ee81: am d580eee2: Merge "SipPhone: switch to its own phone type PHONE_TYPE_SIP." into gingerbread

Merge commit 'f870ee81089ddf5e0388f8b4c7b6a1d437d39ce0'

* commit 'f870ee81089ddf5e0388f8b4c7b6a1d437d39ce0':
  SipPhone: switch to its own phone type PHONE_TYPE_SIP.

telephony/java/com/android/internal/telephony/sip/SipPhoneBase.java

diff --git a/telephony/java/com/android/internal/telephony/sip/SipPhoneBase.java b/telephony/java/com/android/internal/telephony/sip/SipPhoneBase.java
index e742887..5f26af4 100755
--- a/telephony/java/com/android/internal/telephony/sip/SipPhoneBase.java
+++ b/telephony/java/com/android/internal/telephony/sip/SipPhoneBase.java
@@ -175,8 +175,7 @@
     }
 
     public int getPhoneType() {
-        // FIXME: add SIP phone type
-        return Phone.PHONE_TYPE_GSM;
+        return Phone.PHONE_TYPE_SIP;
     }
 
     public SignalStrength getSignalStrength() {