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

Commit 225d2219 authored by Martijn Coenen's avatar Martijn Coenen Committed by android-build-merger
Browse files

Merge "Adddress NFC API review comments." into nyc-dev 

am: 1fef88d8

* commit '1fef88d8':
  Adddress NFC API review comments.

Change-Id: Ib327612766f91c583ea0a23e71bac34615edd12d
parents f2ddee26 1fef88d8

core/java/android/nfc/NfcAdapter.java

+1 −0
Original line number Diff line number Diff line
@@ -393,6 +393,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();

core/java/android/nfc/cardemulation/HostNfcFService.java

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