diff options
| author | Martijn Coenen <maco@google.com> | 2013-10-23 18:12:06 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-23 18:12:06 +0000 |
| commit | d9e98a4b6d3181ab3d58b7781ee2f88a389ecf1f (patch) | |
| tree | f84ed01022f912990b009323723b8fc952a62faf | |
| parent | 871cb5d53f14ce6ead2c65ee3a4354e22276a169 (diff) | |
| parent | 8c99ab849e7d9c87bae3b20377af66ad266eba99 (diff) | |
| download | frameworks_base-d9e98a4b6d3181ab3d58b7781ee2f88a389ecf1f.zip frameworks_base-d9e98a4b6d3181ab3d58b7781ee2f88a389ecf1f.tar.gz frameworks_base-d9e98a4b6d3181ab3d58b7781ee2f88a389ecf1f.tar.bz2 | |
Merge "Unhide BIND_NFC_SERVICE permission." into klp-dev
| -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" |