diff options
| author | Dan Morrill <morrildl@google.com> | 2010-09-01 15:05:34 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-01 15:05:34 -0700 |
| commit | 61f1cbdd71942433ce1515b614ec3d9c259ea037 (patch) | |
| tree | 9152ec01a4c86d5d28d54709d8875982faa50957 /core/java | |
| parent | b4de2f997591d3ee5f1eff92fbf2d4628cee5f2c (diff) | |
| parent | a800a2efa29d88e198220753f07e7d9ff69ddd9b (diff) | |
| download | frameworks_base-61f1cbdd71942433ce1515b614ec3d9c259ea037.zip frameworks_base-61f1cbdd71942433ce1515b614ec3d9c259ea037.tar.gz frameworks_base-61f1cbdd71942433ce1515b614ec3d9c259ea037.tar.bz2 | |
am a800a2ef: Merge "Adding a feature definition corresponding to support for Near-Field Communications (NFC)." into gingerbread
Merge commit 'a800a2efa29d88e198220753f07e7d9ff69ddd9b' into gingerbread-plus-aosp
* commit 'a800a2efa29d88e198220753f07e7d9ff69ddd9b':
Adding a feature definition corresponding to support for Near-Field
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/content/pm/PackageManager.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index 7f166cf..52010a8 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -705,6 +705,14 @@ public abstract class PackageManager { /** * Feature for {@link #getSystemAvailableFeatures} and + * {@link #hasSystemFeature}: The device can communicate using Near-Field + * Communications (NFC). + */ + @SdkConstant(SdkConstantType.FEATURE) + public static final String FEATURE_NFC = "android.hardware.nfc"; + + /** + * Feature for {@link #getSystemAvailableFeatures} and * {@link #hasSystemFeature}: The device includes a magnetometer (compass). */ @SdkConstant(SdkConstantType.FEATURE) |