commit 289d6f3a67cc9a8c5f0cc5de881b1b9917b9613b
author Maarten Derks <maarten@fairphone.com> Wed Oct 06 11:16:23 2021 +0200
committer Maarten Derks <maarten@fairphone.com> Wed Oct 06 11:16:23 2021 +0200
tree 8900ce760ea61a29858fe6aed4bbbeaa84d47764
parent ffee0ed529451a832d9da16dccff2669ff875394
parent 3eeec2c1cbeec236614dbd0b8104f02dbfcd3e4e

Merge branch 'security-aosp-pi-release' into int/p/fp2

* security-aosp-pi-release:
  Add permission to start NFC activity to ensure it is from NFC stack

Change-Id: I8f0e06593fccf57a30da2c936ac4ef8cfa1cce8f

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index df17359..5a4c234 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -491,6 +491,7 @@
 
         <activity
             android:name=".vcard.NfcImportVCardActivity"
+            android:permission="android.permission.DISPATCH_NFC_MESSAGE"
             android:configChanges="orientation|screenSize|keyboardHidden"
             android:theme="@style/BackgroundOnlyTheme">
             <intent-filter>