diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-09-02 19:30:16 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-02 19:30:16 -0700 |
| commit | 3559d1d1fc9d6e57325f50cde36c433044793b11 (patch) | |
| tree | 0760202347610657b2d0cc8130ce7d4a44aac735 /voip | |
| parent | b4332985306632306fdcc77c81fe09f84fe37737 (diff) | |
| parent | ea16e72bff350c0b6e2a00a82b934d1a2fc0fa2d (diff) | |
| download | frameworks_base-3559d1d1fc9d6e57325f50cde36c433044793b11.zip frameworks_base-3559d1d1fc9d6e57325f50cde36c433044793b11.tar.gz frameworks_base-3559d1d1fc9d6e57325f50cde36c433044793b11.tar.bz2 | |
am ea16e72b: am b355714a: Merge "SipManager: always return true for SIP API and VOIP support query." into gingerbread
Merge commit 'ea16e72bff350c0b6e2a00a82b934d1a2fc0fa2d'
* commit 'ea16e72bff350c0b6e2a00a82b934d1a2fc0fa2d':
SipManager: always return true for SIP API and VOIP support query.
Diffstat (limited to 'voip')
| -rw-r--r-- | voip/java/android/net/sip/SipManager.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/voip/java/android/net/sip/SipManager.java b/voip/java/android/net/sip/SipManager.java index 700fb4e..beec8fe 100644 --- a/voip/java/android/net/sip/SipManager.java +++ b/voip/java/android/net/sip/SipManager.java @@ -83,16 +83,22 @@ public class SipManager { * Returns true if the SIP API is supported by the system. */ public static boolean isApiSupported(Context context) { + return true; + /* return context.getPackageManager().hasSystemFeature( PackageManager.FEATURE_SIP); + */ } /** * Returns true if the system supports SIP-based VoIP. */ public static boolean isVoipSupported(Context context) { + return true; + /* return context.getPackageManager().hasSystemFeature( PackageManager.FEATURE_SIP_VOIP) && isApiSupported(context); + */ } private SipManager() { |