drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'fefd48965c5f521f21c10aad86586cf68ae48f71':
  Small NFC API docs addition.
This commit is contained in:
Martijn Coenen
2012-06-07 10:37:24 -07:00
committed by Android Git Automerger
parent af56345cf8 fefd48965c
commit 57486f9535
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/nfc/NfcAdapter.java
View File

@ -637,6 +637,9 @@ public final class NfcAdapter {
* {@link Activity#onDestroy}. This is guaranteed if you call this API * {@link Activity#onDestroy}. This is guaranteed if you call this API
* during {@link Activity#onCreate}. * 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. * <p class="note">Requires the {@link android.Manifest.permission#NFC} permission.
* *
* @param uris an array of Uri(s) to push over Android Beam * @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 * {@link Activity#onDestroy}. This is guaranteed if you call this API
* during {@link Activity#onCreate}. * 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. * <p class="note">Requires the {@link android.Manifest.permission#NFC} permission.
* *
* @param callback callback, or null to disable * @param callback callback, or null to disable