drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 45bd8303: Merge "Uncomment SIP/VOIP feature check in SipManager." into gingerbread

Browse Source 
Merge commit '45bd8303fe20f20843f5a76ddf42a5ace54add58' into gingerbread-plus-aosp

* commit '45bd8303fe20f20843f5a76ddf42a5ace54add58':
  Uncomment SIP/VOIP feature check in SipManager.
This commit is contained in:
John Huang
2010-10-18 13:44:57 -07:00
committed by Android Git Automerger
parent 3e9bcb98c4 45bd8303fe
commit 085996c411
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
voip/java/android/net/sip/SipManager.java
View File

@ -126,22 +126,16 @@ public class SipManager {
* Returns true if the SIP API is supported by the system.
*/
public static boolean isApiSupported(Context context) {
return true;
/* TODO: uncomment this before ship
return context.getPackageManager().hasSystemFeature(
PackageManager.FEATURE_SIP);
*/
}
/**
* Returns true if the system supports SIP-based VoIP.
*/
public static boolean isVoipSupported(Context context) {
return true;
/* TODO: uncomment this before ship
return context.getPackageManager().hasSystemFeature(
PackageManager.FEATURE_SIP_VOIP) && isApiSupported(context);
*/
}
/**