Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cfdae131 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add label and description for NFC_TRANSACTION_EVENT" am: 635e7675 am:... 

Merge "Add label and description for NFC_TRANSACTION_EVENT" am: 635e7675 am: 422648fd am: fb25ff72 am: 11c1e5bd am: 74deb4d5

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2569790



Change-Id: If39cc1d51d9fcb4140868ae36bc3ce51c0066885
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 351d32ed 74deb4d5

core/res/AndroidManifest.xml

+2 −0
Original line number Diff line number Diff line
@@ -2372,6 +2372,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.

core/res/res/values/strings.xml

+6 −0
Original line number Diff line number Diff line
@@ -1710,6 +1710,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. -->