diff options
| author | Martijn Coenen <maco@google.com> | 2012-06-06 13:07:47 -0700 |
|---|---|---|
| committer | Martijn Coenen <maco@google.com> | 2012-06-06 17:05:37 -0700 |
| commit | 3b6ecf0ec1a6822577450908f46496cbe121202e (patch) | |
| tree | 354306040efece3f6a9133c3b4c0a075477182c6 | |
| parent | b215726a0e46400c8dbc4a585c2f4200c7a619b6 (diff) | |
| download | frameworks_base-3b6ecf0ec1a6822577450908f46496cbe121202e.zip frameworks_base-3b6ecf0ec1a6822577450908f46496cbe121202e.tar.gz frameworks_base-3b6ecf0ec1a6822577450908f46496cbe121202e.tar.bz2 | |
Small NFC API docs addition.
Indicate that if the device does not support Bluetooth or WiFI,
calling the API is a no-op.
Bug: 6620788
Change-Id: Ib261e0e7855d0914e97803b3b808015b72f3a186
| -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 |