diff options
| author | Dan Morrill <morrildl@google.com> | 2010-09-01 15:03:02 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-09-01 15:03:02 -0700 |
| commit | a800a2efa29d88e198220753f07e7d9ff69ddd9b (patch) | |
| tree | 8fade8cab9c05398c724489f86bbb78cb8ba44dc /core/java/android | |
| parent | 05f0382bcf11d96760ee8cf9110099a1661eed7c (diff) | |
| parent | 76437d379357a418b8236b041d1b3e03939264e6 (diff) | |
Merge "Adding a feature definition corresponding to support for Near-Field Communications (NFC)." into gingerbread
Diffstat (limited to 'core/java/android')
| -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 7f166cfbd744..52010a84315f 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) |