diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-09-07 19:40:40 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-07 19:40:40 -0700 |
| commit | f870ee81089ddf5e0388f8b4c7b6a1d437d39ce0 (patch) | |
| tree | c805cc5de81145954921d0bff90e620ef5ed7333 | |
| parent | 2a08e2a9f881d06a03e36367585137e05706f592 (diff) | |
| parent | d580eee29b50e1f11485b655fe5e6cc5a564615b (diff) | |
| download | frameworks_base-f870ee81089ddf5e0388f8b4c7b6a1d437d39ce0.zip frameworks_base-f870ee81089ddf5e0388f8b4c7b6a1d437d39ce0.tar.gz frameworks_base-f870ee81089ddf5e0388f8b4c7b6a1d437d39ce0.tar.bz2 | |
am d580eee2: Merge "SipPhone: switch to its own phone type PHONE_TYPE_SIP." into gingerbread
Merge commit 'd580eee29b50e1f11485b655fe5e6cc5a564615b' into gingerbread-plus-aosp
* commit 'd580eee29b50e1f11485b655fe5e6cc5a564615b':
SipPhone: switch to its own phone type PHONE_TYPE_SIP.
| -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() { |