From 3b6ecf0ec1a6822577450908f46496cbe121202e Mon Sep 17 00:00:00 2001 From: Martijn Coenen Date: Wed, 6 Jun 2012 13:07:47 -0700 Subject: 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 --- core/java/android/nfc/NfcAdapter.java | 6 ++++++ 1 file changed, 6 insertions(+) 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}. * + *

If this device does not support alternate transports + * such as Bluetooth or WiFI, calling this method does nothing. + * *

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}. * + *

If this device does not support alternate transports + * such as Bluetooth or WiFI, calling this method does nothing. + * *

Requires the {@link android.Manifest.permission#NFC} permission. * * @param callback callback, or null to disable -- cgit v1.1