summaryrefslogtreecommitdiffstats
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorGeorge Chang <georgekgchang@google.com>2021-03-30 03:07:50 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-03-30 03:07:50 +0000
commitb5587dbd6bc9ee8317d4b4ec7e2d4f3f41e70b27 (patch)
tree31f898eeab2831eecbe5d6a7a60b922115647518 /AndroidManifest.xml
parent088feac02a639447cfcebc05e29f222b02647253 (diff)
parent4a7727e8215191f52e71a851adac1c7c9348066b (diff)
downloadplatform_packages_apps_Nfc-b5587dbd6bc9ee8317d4b4ec7e2d4f3f41e70b27.tar.gz
platform_packages_apps_Nfc-b5587dbd6bc9ee8317d4b4ec7e2d4f3f41e70b27.tar.bz2
platform_packages_apps_Nfc-b5587dbd6bc9ee8317d4b4ec7e2d4f3f41e70b27.zip
Merge "Update SetControllerAlwaysOn and PRIVILEGED permission" am: 3634e4178c am: 4a7727e821
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Nfc/+/1650331 Change-Id: Id549fa120e9c481fd8616098dca3a39bce494ee7
Diffstat (limited to 'AndroidManifest.xml')
-rwxr-xr-xAndroidManifest.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 3a662647..b4814f52 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -22,6 +22,7 @@
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
<uses-permission android:name="android.permission.BLUETOOTH_PRIVILEGED" />
<uses-permission android:name="android.permission.NFC" />
+ <uses-permission android:name="android.permission.NFC_SET_CONTROLLER_ALWAYS_ON" />
<uses-permission android:name="android.permission.BIND_NFC_SERVICE" />
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
<uses-permission android:name="android.permission.STATUS_BAR" />