diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-09-01 18:01:31 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-01 18:01:31 -0700 |
| commit | 3e4975a52ccd9dade7fffc9f8c144bff0f4c3cb1 (patch) | |
| tree | 627a3c5879f88b207af0f806d233b8c1e763ab71 /core/java | |
| parent | fd0eed007d99178092ede56ec2c4799046615f70 (diff) | |
| parent | 3424c02e6b931a8bbd651ae75217bebd008b2605 (diff) | |
| download | frameworks_base-3e4975a52ccd9dade7fffc9f8c144bff0f4c3cb1.zip frameworks_base-3e4975a52ccd9dade7fffc9f8c144bff0f4c3cb1.tar.gz frameworks_base-3e4975a52ccd9dade7fffc9f8c144bff0f4c3cb1.tar.bz2 | |
am 3424c02e: Add software features for SIP and VOIP
Merge commit '3424c02e6b931a8bbd651ae75217bebd008b2605' into gingerbread-plus-aosp
* commit '3424c02e6b931a8bbd651ae75217bebd008b2605':
Add software features for SIP and VOIP
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/content/pm/PackageManager.java | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index 52010a8..33a1db8 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -760,7 +760,21 @@ public abstract class PackageManager { */ @SdkConstant(SdkConstantType.FEATURE) public static final String FEATURE_TELEPHONY_GSM = "android.hardware.telephony.gsm"; - + + /** + * Feature for {@link #getSystemAvailableFeatures} and + * {@link #hasSystemFeature}: The SIP API is enabled on the device. + */ + @SdkConstant(SdkConstantType.FEATURE) + public static final String FEATURE_SIP = "android.software.sip"; + + /** + * Feature for {@link #getSystemAvailableFeatures} and + * {@link #hasSystemFeature}: The device supports SIP-based VOIP. + */ + @SdkConstant(SdkConstantType.FEATURE) + public static final String FEATURE_SIP_VOIP = "android.software.sip.voip"; + /** * Feature for {@link #getSystemAvailableFeatures} and * {@link #hasSystemFeature}: The device's display has a touch screen. |