diff options
| author | 2018-01-29 18:18:11 +0000 | |
|---|---|---|
| committer | 2018-01-29 18:18:11 +0000 | |
| commit | 626f665a655f282d1bccada6141bcf280d72e7ba (patch) | |
| tree | 1014fcafa7bd2fcc27038fc2ff822889b126005f | |
| parent | 38cbc885d183f7b683c42714565fd95222207a3d (diff) | |
| parent | ac2247c4060567850d98735734de666ee60f6fbb (diff) | |
Merge "Add android.Manifest.permission.NFC_TRANSACTION_EVENT"
am: ac2247c406
Change-Id: I6592686f765e3474d1c02bf9b3bc243ab152b641
| -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 fdda55bfa01b..07f9530116ca 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" |