diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-09-07 19:37:33 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-09-07 19:37:33 -0700 |
| commit | d580eee29b50e1f11485b655fe5e6cc5a564615b (patch) | |
| tree | ed4a55dba011d0c5d3647552242651ea40efbde8 /telephony/java | |
| parent | a19ef306bd0a257c67b50f5e0e669e9fe52b0889 (diff) | |
| parent | 8744f879852a74885e1c56a65cd65a28b6a5fa7a (diff) | |
| download | frameworks_base-d580eee29b50e1f11485b655fe5e6cc5a564615b.zip frameworks_base-d580eee29b50e1f11485b655fe5e6cc5a564615b.tar.gz frameworks_base-d580eee29b50e1f11485b655fe5e6cc5a564615b.tar.bz2 | |
Merge "SipPhone: switch to its own phone type PHONE_TYPE_SIP." into gingerbread
Diffstat (limited to 'telephony/java')
| -rwxr-xr-x | telephony/java/com/android/internal/telephony/sip/SipPhoneBase.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/telephony/java/com/android/internal/telephony/sip/SipPhoneBase.java b/telephony/java/com/android/internal/telephony/sip/SipPhoneBase.java index 4b7e991..9098e6f 100755 --- a/telephony/java/com/android/internal/telephony/sip/SipPhoneBase.java +++ b/telephony/java/com/android/internal/telephony/sip/SipPhoneBase.java @@ -176,8 +176,7 @@ abstract class SipPhoneBase extends PhoneBase { } public int getPhoneType() { - // FIXME: add SIP phone type - return Phone.PHONE_TYPE_GSM; + return Phone.PHONE_TYPE_SIP; } public SignalStrength getSignalStrength() { |