diff options
| -rw-r--r-- | api/current.txt | 3 | ||||
| -rw-r--r-- | core/java/android/content/pm/PackageManager.java | 12 | ||||
| -rw-r--r-- | core/res/res/values/attrs.xml | 6 | ||||
| -rw-r--r-- | core/res/res/values/public.xml | 1 |
4 files changed, 20 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index ca8a7dd..99d8391 100644 --- a/api/current.txt +++ b/api/current.txt @@ -867,6 +867,7 @@ package android { field public static final int reqKeyboardType = 16843304; // 0x1010228 field public static final int reqNavigation = 16843306; // 0x101022a field public static final int reqTouchScreen = 16843303; // 0x1010227 + field public static final int requireDeviceUnlock = 16843754; // 0x10103ea field public static final int required = 16843406; // 0x101028e field public static final int requiredAccountType = 16843734; // 0x10103d6 field public static final int requiredForAllUsers = 16843728; // 0x10103d0 @@ -7328,7 +7329,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_NFC_HOST_CARD_EMULATION = "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 81f860e..d58b14c 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -957,12 +957,24 @@ public abstract class PackageManager { * Feature for {@link #getSystemAvailableFeatures} and * {@link #hasSystemFeature}: The device supports host- * based NFC card emulation. + * + * TODO remove when depending apps have moved to new constant. + * @hide + * @deprecated */ @SdkConstant(SdkConstantType.FEATURE) public static final String FEATURE_NFC_HCE = "android.hardware.nfc.hce"; /** * Feature for {@link #getSystemAvailableFeatures} and + * {@link #hasSystemFeature}: The device supports host- + * based NFC card emulation. + */ + @SdkConstant(SdkConstantType.FEATURE) + public static final String FEATURE_NFC_HOST_CARD_EMULATION = "android.hardware.nfc.hce"; + + /** + * Feature for {@link #getSystemAvailableFeatures} and * {@link #hasSystemFeature}: The device includes an accelerometer. */ @SdkConstant(SdkConstantType.FEATURE) diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index 50ea08b..5444cb1 100644 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -2602,6 +2602,9 @@ <!-- Short description of the functionality the service implements. This attribute is mandatory.--> <attr name="description" /> + <!-- Whether the device must be unlocked before routing data to this service. + The default is false.--> + <attr name="requireDeviceUnlock" format="boolean"/> </declare-styleable> <!-- Use <code>offhost-apdu-service</code> as the root tag of the XML resource that @@ -2622,7 +2625,8 @@ <!-- Short description of what the AID group implements. This attribute is mandatory.--> <attr name="description" /> <!-- The category attribute will be used by the Android platform to present - multiple applications that register AIDs in the same category uniformly. + multiple applications that register ISO 7816 Application IDs (AIDs) in the + same category uniformly. Additionally, when a category is specified, Android will ensure that either all AIDs in this group are routed to this application, or none at all. This attribute is optional.--> diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index f2ec04f..696e782 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -2073,5 +2073,6 @@ <public type="attr" name="customRoots" /> <public type="attr" name="autoMirrored" /> <public type="attr" name="supportsSwitchingToNextInputMethod" /> + <public type="attr" name="requireDeviceUnlock" /> </resources> |