diff options
| author | Martijn Coenen <maco@google.com> | 2013-07-22 22:29:21 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-07-22 22:29:21 +0000 |
| commit | ce1279686b17940127292aa815d46dc1cc4d71af (patch) | |
| tree | fa452e482e8f4395edcb6cc500556fc0f4b2d23c | |
| parent | 03903b3bc8fb592884421c2a5f8c6266ff2b4881 (diff) | |
| parent | f4bf158328fd1bcb171baab043460efd5c58152c (diff) | |
| download | frameworks_base-ce1279686b17940127292aa815d46dc1cc4d71af.zip frameworks_base-ce1279686b17940127292aa815d46dc1cc4d71af.tar.gz frameworks_base-ce1279686b17940127292aa815d46dc1cc4d71af.tar.bz2 | |
Merge "Add host-based card emu feature to PackageManager."
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/content/pm/PackageManager.java | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 0ec8d85..590a674 100644 --- a/api/current.txt +++ b/api/current.txt @@ -7116,6 +7116,7 @@ package android.content.pm { field public static final java.lang.String FEATURE_LOCATION_NETWORK = "android.hardware.location.network"; field public static final java.lang.String FEATURE_MICROPHONE = "android.hardware.microphone"; field public static final java.lang.String FEATURE_NFC = "android.hardware.nfc"; + field public static final java.lang.String FEATURE_NFC_HCE = "android.hardware.nfc.hce"; field public static final java.lang.String FEATURE_SCREEN_LANDSCAPE = "android.hardware.screen.landscape"; field public static final java.lang.String FEATURE_SCREEN_PORTRAIT = "android.hardware.screen.portrait"; field public static final java.lang.String FEATURE_SENSOR_ACCELEROMETER = "android.hardware.sensor.accelerometer"; diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index 8a8751e..81f860e 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -955,6 +955,14 @@ public abstract class PackageManager { /** * Feature for {@link #getSystemAvailableFeatures} and + * {@link #hasSystemFeature}: The device supports host- + * based NFC card emulation. + */ + @SdkConstant(SdkConstantType.FEATURE) + public static final String FEATURE_NFC_HCE = "android.hardware.nfc.hce"; + + /** + * Feature for {@link #getSystemAvailableFeatures} and * {@link #hasSystemFeature}: The device includes an accelerometer. */ @SdkConstant(SdkConstantType.FEATURE) |