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

Commit fefd4896 authored by Martijn Coenen's avatar Martijn Coenen Committed by Android (Google) Code Review
Browse files

Merge "Small NFC API docs addition." into jb-dev

parents 059537e7 3b6ecf0e

core/java/android/nfc/NfcAdapter.java

+6 −0
Original line number Diff line number Diff line
@@ -637,6 +637,9 @@ public final class NfcAdapter { 
     * {@link Activity#onDestroy}. This is guaranteed if you call this API

     * during {@link Activity#onCreate}.

     *

     * <p class="note">If this device does not support alternate transports

     * such as Bluetooth or WiFI, calling this method does nothing.

     *

     * <p class="note">Requires the {@link android.Manifest.permission#NFC} permission.

     *

     * @param uris an array of Uri(s) to push over Android Beam
@@ -711,6 +714,9 @@ public final class NfcAdapter { 
     * {@link Activity#onDestroy}. This is guaranteed if you call this API

     * during {@link Activity#onCreate}.

     *

     * <p class="note">If this device does not support alternate transports

     * such as Bluetooth or WiFI, calling this method does nothing.

     *

     * <p class="note">Requires the {@link android.Manifest.permission#NFC} permission.

     *

     * @param callback callback, or null to disable