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

Commit ffe2a9c4 authored by Ruchi Kandoi's avatar Ruchi Kandoi Committed by android-build-merger
Browse files

Merge "Add android.Manifest.permission.NFC_TRANSACTION_EVENT" am: ac2247c4 am: 626f665a 

am: 8142017f

Change-Id: I7ef07b3aa3a59f510a7a5e897d134707c04f675b
parents af2397da 8142017f

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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";

core/res/AndroidManifest.xml

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