diff options
| author | Martijn Coenen <maco@google.com> | 2012-06-07 10:35:15 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-06-07 10:35:15 -0700 |
| commit | fefd48965c5f521f21c10aad86586cf68ae48f71 (patch) | |
| tree | d38dcd9f045f112100192b49f6f881106b2de8f5 | |
| parent | 059537e7924a5547849b537bf0e50d2f814b80a5 (diff) | |
| parent | 3b6ecf0ec1a6822577450908f46496cbe121202e (diff) | |
| download | frameworks_base-fefd48965c5f521f21c10aad86586cf68ae48f71.zip frameworks_base-fefd48965c5f521f21c10aad86586cf68ae48f71.tar.gz frameworks_base-fefd48965c5f521f21c10aad86586cf68ae48f71.tar.bz2 | |
Merge "Small NFC API docs addition." into jb-dev
| -rw-r--r-- | core/java/android/nfc/NfcAdapter.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/core/java/android/nfc/NfcAdapter.java b/core/java/android/nfc/NfcAdapter.java index 4464d58..8407380 100644 --- a/core/java/android/nfc/NfcAdapter.java +++ b/core/java/android/nfc/NfcAdapter.java @@ -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 |