Merge "Add label and description for NFC_TRANSACTION_EVENT" am: 635e76753b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2569790 Change-Id: I27b631ab1bcf0b416e00392e2777519d8ef7c7d3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -2329,6 +2329,8 @@
|
||||
<p>Protection level: normal
|
||||
-->
|
||||
<permission android:name="android.permission.NFC_TRANSACTION_EVENT"
|
||||
android:description="@string/permdesc_nfcTransactionEvent"
|
||||
android:label="@string/permlab_nfcTransactionEvent"
|
||||
android:protectionLevel="normal" />
|
||||
|
||||
<!-- Allows applications to receive NFC preferred payment service information.
|
||||
|
||||
@@ -1608,6 +1608,12 @@
|
||||
<string name="permdesc_nfc">Allows the app to communicate
|
||||
with Near Field Communication (NFC) tags, cards, and readers.</string>
|
||||
|
||||
<!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
|
||||
<string name="permlab_nfcTransactionEvent">Secure Element transaction event</string>
|
||||
<!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
|
||||
<string name="permdesc_nfcTransactionEvent">Allows the app to receive information about
|
||||
transactions happening on a Secure Element.</string>
|
||||
|
||||
<!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
|
||||
<string name="permlab_disableKeyguard">disable your screen lock</string>
|
||||
<!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
|
||||
|
||||
Reference in New Issue
Block a user