summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorMartijn Coenen <maco@google.com>2017-04-13 17:20:35 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-04-13 17:20:35 +0000
commit68c232afaf808e3f0716a5a2876ab2532ead08c5 (patch)
tree814851783db1fe4c25276e393c809640798d6de8 /data
parentc542de05f37d63eeed781850aceefa00494ee41b (diff)
parent32d7be2f159c507c2c6854040faf8f796b9caabb (diff)
downloadnative-68c232afaf808e3f0716a5a2876ab2532ead08c5.tar.gz
Merge "Add android.hardware.nfc.any to NFC features." into oc-dev am: e7def4e9e0
am: 32d7be2f15 Change-Id: I62810eb6a2a7410f1113adcd4359d499ac8bd73d
Diffstat (limited to 'data')
-rw-r--r--data/etc/android.hardware.nfc.hce.xml1
-rw-r--r--data/etc/android.hardware.nfc.hcef.xml1
-rw-r--r--data/etc/android.hardware.nfc.xml1
3 files changed, 3 insertions, 0 deletions
diff --git a/data/etc/android.hardware.nfc.hce.xml b/data/etc/android.hardware.nfc.hce.xml
index 10b96b1d78..95da181a75 100644
--- a/data/etc/android.hardware.nfc.hce.xml
+++ b/data/etc/android.hardware.nfc.hce.xml
@@ -18,4 +18,5 @@
NFC card emulation -->
<permissions>
<feature name="android.hardware.nfc.hce" />
+ <feature name="android.hardware.nfc.any" />
</permissions>
diff --git a/data/etc/android.hardware.nfc.hcef.xml b/data/etc/android.hardware.nfc.hcef.xml
index 0d03023073..b86890df2e 100644
--- a/data/etc/android.hardware.nfc.hcef.xml
+++ b/data/etc/android.hardware.nfc.hcef.xml
@@ -18,4 +18,5 @@
NFC-F card emulation -->
<permissions>
<feature name="android.hardware.nfc.hcef" />
+ <feature name="android.hardware.nfc.any" />
</permissions>
diff --git a/data/etc/android.hardware.nfc.xml b/data/etc/android.hardware.nfc.xml
index 81c4a84110..5201fa2273 100644
--- a/data/etc/android.hardware.nfc.xml
+++ b/data/etc/android.hardware.nfc.xml
@@ -18,4 +18,5 @@
using Near-Field Communications (NFC). -->
<permissions>
<feature name="android.hardware.nfc" />
+ <feature name="android.hardware.nfc.any" />
</permissions>