diff options
| author | Jack Yu <jackcwyu@google.com> | 2021-02-03 03:00:32 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-03 03:00:32 +0000 |
| commit | 87e9535aa3088c579c1901c87665ef89dab93e06 (patch) | |
| tree | 6ed7161adbc2f08699c54983fdba00364672b55d /core/res | |
| parent | 66783f7bb66748018713ea5e56dd2c8077671e82 (diff) | |
| parent | 809b2f2459ef3732c0c67a100df7a7bb2ba42d84 (diff) | |
Merge "Add attr for nfc applications to configure support power states" am: 809b2f2459
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1470724
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3d789cfa9ba6cc199e53663eda34f8c4586b1dbf
Diffstat (limited to 'core/res')
| -rw-r--r-- | core/res/res/values/attrs.xml | 9 | ||||
| -rw-r--r-- | core/res/res/values/public.xml | 1 |
2 files changed, 10 insertions, 0 deletions
diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index 4b3d82a04b8b..9cc0690126e9 100644 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -3856,6 +3856,9 @@ <!-- Component name of an activity that allows the user to modify the settings for this service. --> <attr name="settingsActivity"/> + <!-- Whether the device must be screen on before routing data to this service. + The default is true.--> + <attr name="requireDeviceScreenOn" format="boolean"/> </declare-styleable> <!-- Use <code>offhost-apdu-service</code> as the root tag of the XML resource that @@ -3874,6 +3877,12 @@ <attr name="settingsActivity"/> <!-- Secure Element which the AIDs should be routed to --> <attr name="secureElementName" format="string"/> + <!-- Whether the device must be unlocked before routing data to this service. + The default is false.--> + <attr name="requireDeviceUnlock"/> + <!-- Whether the device must be screen on before routing data to this service. + The default is false.--> + <attr name="requireDeviceScreenOn"/> </declare-styleable> <!-- Specify one or more <code>aid-group</code> elements inside a diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index a0be0681bd38..0874a77815b5 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -3045,6 +3045,7 @@ <public-group type="attr" first-id="0x01010617"> <public name="canPauseRecording" /> <!-- attribute definitions go here --> + <public name="requireDeviceScreenOn" /> </public-group> <public-group type="drawable" first-id="0x010800b5"> |