From 6136730e3bf463f744d22d4d5a236d9183b9064e Mon Sep 17 00:00:00 2001
From: Martijn Coenen <maco@google.com>
Date: Tue, 17 May 2016 09:09:15 +0200
Subject: [PATCH] Adddress NFC API review comments.

Bug: 28775492
Change-Id: I01befba3435f0d882787fecabd3c1041fe7260d7
---
 core/java/android/nfc/NfcAdapter.java                    | 1 +
 core/java/android/nfc/cardemulation/HostNfcFService.java | 9 +++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/core/java/android/nfc/NfcAdapter.java b/core/java/android/nfc/NfcAdapter.java
index 8406bcfa8184d..41ff9fdf8382b 100644
--- a/core/java/android/nfc/NfcAdapter.java
+++ b/core/java/android/nfc/NfcAdapter.java
@@ -392,6 +392,7 @@ public final class NfcAdapter {
 
     /**
      * A callback that is invoked when a tag is removed from the field.
+     * @see NfcAdapter#ignore
      */
     public interface OnTagRemovedListener {
         void onTagRemoved();
diff --git a/core/java/android/nfc/cardemulation/HostNfcFService.java b/core/java/android/nfc/cardemulation/HostNfcFService.java
index 1d4baf4849cfd..27c4976786f4d 100644
--- a/core/java/android/nfc/cardemulation/HostNfcFService.java
+++ b/core/java/android/nfc/cardemulation/HostNfcFService.java
@@ -42,8 +42,13 @@ import android.util.Log;
  * exactly one System Code and one NFCID2. For details about the use of
  * System Code and NFCID2, see the NFC Forum Digital specification.</p>
  * <p>To statically register a System Code and NFCID2 with the service, a {@link #SERVICE_META_DATA}
- * entry must be included in the declaration of the service. An example of a HostNfcFService
- * manifest declaration is shown below:
+ * entry must be included in the declaration of the service.
+ *
+ * <p>All {@link HostNfcFService HostNfcFService} declarations in the manifest must require the
+ * {@link android.Manifest.permission#BIND_NFC_SERVICE} permission
+ * in their &lt;service&gt; tag, to ensure that only the platform can bind to your service.</p>
+ *
+ * <p>An example of a HostNfcFService manifest declaration is shown below:
  *
  * <pre> &lt;service android:name=".MyHostNfcFService" android:exported="true" android:permission="android.permission.BIND_NFC_SERVICE"&gt;
  *     &lt;intent-filter&gt;