diff options
| author | 2018-01-29 18:32:53 +0000 | |
|---|---|---|
| committer | 2018-01-29 18:32:53 +0000 | |
| commit | ffe2a9c4c85af3bdbc6a99dfc800202bfd51027c (patch) | |
| tree | 8ac6cf27a2a191cc5847ee9b50293e3ba258af40 | |
| parent | af2397da51fbb83cef7a42547f2cb0efdcda417b (diff) | |
| parent | 8142017f62a93f636a3e72dbb0d18302173fe9dd (diff) | |
Merge "Add android.Manifest.permission.NFC_TRANSACTION_EVENT" am: ac2247c406 am: 626f665a65
am: 8142017f62
Change-Id: I7ef07b3aa3a59f510a7a5e897d134707c04f675b
| -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 7a54e6d49a9a..55872c80b6c7 100644 --- a/api/current.txt +++ b/api/current.txt @@ -94,6 +94,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 2779cd6846d4..36082ca1b3b8 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -1457,6 +1457,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" |