diff options
| author | Martijn Coenen <maco@google.com> | 2013-08-28 11:18:58 -0700 |
|---|---|---|
| committer | Martijn Coenen <maco@google.com> | 2013-08-28 11:18:58 -0700 |
| commit | df4d1d624d44008e919755c7a212d9e2feb4f00b (patch) | |
| tree | 024c12c3fc96e54bf57e41b3d360222cdf8809c1 /core/res | |
| parent | bbbc8660cdbfb033291f1911742a942a42c85af0 (diff) | |
| download | frameworks_base-df4d1d624d44008e919755c7a212d9e2feb4f00b.zip frameworks_base-df4d1d624d44008e919755c7a212d9e2feb4f00b.tar.gz frameworks_base-df4d1d624d44008e919755c7a212d9e2feb4f00b.tar.bz2 | |
Add requireDeviceUnlock attribute for NFC HCE.
Also added AID description, and renamed PackageManager
feature. The old name has to stay at least for a bit,
because we are already deploying apps in our builds that
use the constant.
Bug: 10461409
Bug: 10461753
Change-Id: I7a5bb023bb567dd8b0a17e8e54e9559d7fcf64f5
Diffstat (limited to 'core/res')
| -rw-r--r-- | core/res/res/values/attrs.xml | 6 | ||||
| -rw-r--r-- | core/res/res/values/public.xml | 1 |
2 files changed, 6 insertions, 1 deletions
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> |