diff options
| author | Martijn Coenen <maco@google.com> | 2013-10-23 10:43:16 -0700 |
|---|---|---|
| committer | Martijn Coenen <maco@google.com> | 2013-10-23 10:43:16 -0700 |
| commit | 8c99ab849e7d9c87bae3b20377af66ad266eba99 (patch) | |
| tree | db3c8e4015e9abf53ef6b3393ec04db276be92ae | |
| parent | 798adeffb0b9c22707b493895453e7dd2f608b75 (diff) | |
| download | frameworks_base-8c99ab849e7d9c87bae3b20377af66ad266eba99.zip frameworks_base-8c99ab849e7d9c87bae3b20377af66ad266eba99.tar.gz frameworks_base-8c99ab849e7d9c87bae3b20377af66ad266eba99.tar.bz2 | |
Unhide BIND_NFC_SERVICE permission.
Needs to be held by host-based card emulation
apps in order to work.
Bug: 11352063
Change-Id: I8ba42446cd3066b38309d8e9cbc51d140a023547
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | core/res/AndroidManifest.xml | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index 054f1cd..94b4027 100644 --- a/api/current.txt +++ b/api/current.txt @@ -22,6 +22,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"; diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index eba6231..bd52f49 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -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" |