diff options
| author | 2018-01-29 18:25:10 +0000 | |
|---|---|---|
| committer | 2018-01-29 18:25:10 +0000 | |
| commit | 8142017f62a93f636a3e72dbb0d18302173fe9dd (patch) | |
| tree | 3125bb2a8a78d9be8708d24c5f73162502b4f116 | |
| parent | 753f3259091d129f555732abfc3923a3d9e1a9ff (diff) | |
| parent | 626f665a655f282d1bccada6141bcf280d72e7ba (diff) | |
Merge "Add android.Manifest.permission.NFC_TRANSACTION_EVENT" am: ac2247c406
am: 626f665a65
Change-Id: I562b46b71416406e2640fc84f7b6a064327a7ca8
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | core/res/AndroidManifest.xml | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 2611cbfe7633..2b8b6f51df28 100644 --- a/api/current.txt +++ b/api/current.txt @@ -92,6 +92,7 @@ package android { field public static final java.lang.String MOUNT_FORMAT_FILESYSTEMS = "android.permission.MOUNT_FORMAT_FILESYSTEMS"; field public static final java.lang.String MOUNT_UNMOUNT_FILESYSTEMS = "android.permission.MOUNT_UNMOUNT_FILESYSTEMS"; field public static final java.lang.String NFC = "android.permission.NFC"; + field public static final java.lang.String NFC_TRANSACTION_EVENT = "android.permission.NFC_TRANSACTION_EVENT"; field public static final java.lang.String PACKAGE_USAGE_STATS = "android.permission.PACKAGE_USAGE_STATS"; field public static final deprecated java.lang.String PERSISTENT_ACTIVITY = "android.permission.PERSISTENT_ACTIVITY"; field public static final java.lang.String PROCESS_OUTGOING_CALLS = "android.permission.PROCESS_OUTGOING_CALLS"; diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index f7cd9bb3f508..660dcb8afc7c 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -1415,6 +1415,12 @@ android:label="@string/permlab_nfc" android:protectionLevel="normal" /> + <!-- Allows applications to receive NFC transaction events. + <p>Protection level: normal + --> + <permission android:name="android.permission.NFC_TRANSACTION_EVENT" + android:protectionLevel="normal" /> + <!-- @SystemApi Allows an internal user to use privileged ConnectivityManager APIs. @hide --> <permission android:name="android.permission.CONNECTIVITY_INTERNAL" |