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

Commit 3aab4962 authored by Martijn Coenen's avatar Martijn Coenen Committed by Android Git Automerger
Browse files

am 41fab0a1: am fa191d5a: am d9e98a4b: Merge "Unhide BIND_NFC_SERVICE permission." into klp-dev 

* commit '41fab0a1':
  Unhide BIND_NFC_SERVICE permission.
parents ae25a1a8 41fab0a1

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ package android { 
    field public static final java.lang.String BIND_APPWIDGET = "android.permission.BIND_APPWIDGET";

    field public static final java.lang.String BIND_DEVICE_ADMIN = "android.permission.BIND_DEVICE_ADMIN";

    field public static final java.lang.String BIND_INPUT_METHOD = "android.permission.BIND_INPUT_METHOD";

    field public static final java.lang.String BIND_NFC_SERVICE = "android.permission.BIND_NFC_SERVICE";

    field public static final java.lang.String BIND_NOTIFICATION_LISTENER_SERVICE = "android.permission.BIND_NOTIFICATION_LISTENER_SERVICE";

    field public static final java.lang.String BIND_PRINT_SERVICE = "android.permission.BIND_PRINT_SERVICE";

    field public static final java.lang.String BIND_REMOTEVIEWS = "android.permission.BIND_REMOTEVIEWS";

core/res/AndroidManifest.xml

+1 −2
Original line number Diff line number Diff line
@@ -1958,8 +1958,7 @@ 


    <!-- Must be required by a {@link android.nfc.cardemulation.HostApduService}

         or {@link android.nfc.cardemulation.OffHostApduService} to ensure that only

         the system can bind to it.

         @hide -->

         the system can bind to it. -->

    <permission android:name="android.permission.BIND_NFC_SERVICE"

        android:label="@string/permlab_bindNfcService"

        android:description="@string/permdesc_bindNfcService"