summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Anton Hansson <hansson@google.com> 2023-10-04 10:47:05 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-04 10:47:05 +0000
commitcc3fc75c779cea23164a68da6c1af8b211294c3f (patch)
tree9967b3f3ce1d53848bf0ac085e2e601fb69588c8
parent27017751058a6caa4247e5c9ca2ed29ee6cdf356 (diff)
parent5909d62b3e883772991cb3fea50e80f7ef5bbf66 (diff)
Merge "Fix broken documentation in NfcAdapter" into main am: 71a82818ae am: f61ec5be0f am: 958a6cad6e am: 5909d62b3e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2769723 Change-Id: I2a6c89448f73da431bb9c07d4b6e317896361df2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--core/java/android/nfc/NfcAdapter.java6
1 files changed, 2 insertions, 4 deletions
diff --git a/core/java/android/nfc/NfcAdapter.java b/core/java/android/nfc/NfcAdapter.java
index a9eb672c4e4d..1307dfc2665e 100644
--- a/core/java/android/nfc/NfcAdapter.java
+++ b/core/java/android/nfc/NfcAdapter.java
@@ -484,7 +484,6 @@ public final class NfcAdapter {
/**
* A callback to be invoked when the system successfully delivers your {@link NdefMessage}
* to another device.
- * @see #setOnNdefPushCompleteCallback
* @deprecated this feature is removed. File sharing can work using other technology like
* Bluetooth.
*/
@@ -496,7 +495,6 @@ public final class NfcAdapter {
* <p>This callback is usually made on a binder thread (not the UI thread).
*
* @param event {@link NfcEvent} with the {@link NfcEvent#nfcAdapter} field set
- * @see #setNdefPushMessageCallback
*/
public void onNdefPushComplete(NfcEvent event);
}
@@ -504,11 +502,11 @@ public final class NfcAdapter {
/**
* A callback to be invoked when another NFC device capable of NDEF push (Android Beam)
* is within range.
- * <p>Implement this interface and pass it to {@link
+ * <p>Implement this interface and pass it to {@code
* NfcAdapter#setNdefPushMessageCallback setNdefPushMessageCallback()} in order to create an
* {@link NdefMessage} at the moment that another device is within range for NFC. Using this
* callback allows you to create a message with data that might vary based on the
- * content currently visible to the user. Alternatively, you can call {@link
+ * content currently visible to the user. Alternatively, you can call {@code
* #setNdefPushMessage setNdefPushMessage()} if the {@link NdefMessage} always contains the
* same data.
* @deprecated this feature is removed. File sharing can work using other technology like