summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Brad Lassey <lassey@google.com> 2024-12-10 17:43:52 -0500
committer Brad Lassey <lassey@google.com> 2024-12-11 14:39:09 -0800
commit555bee27f52d5c012784c353a1d412d7817e8289 (patch)
tree9370b75568a96a3093b683c0061fcabdc831e169
parent4d3c3dc220260bab628b4ddcf8299e6cb91677dd (diff)
Add to javadoc for onAidConflictOccurred to clarify what can be done to
recitify that error. Bug: 383352307 Test: javadoc only change Flag: EXEMPT javadoc only change Change-Id: I895e1e1f4587f775a5b7248c7db40b6912de89b3
-rw-r--r--nfc/java/android/nfc/cardemulation/CardEmulation.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/nfc/java/android/nfc/cardemulation/CardEmulation.java b/nfc/java/android/nfc/cardemulation/CardEmulation.java
index e0bc15fe6e94..baae05b4ea03 100644
--- a/nfc/java/android/nfc/cardemulation/CardEmulation.java
+++ b/nfc/java/android/nfc/cardemulation/CardEmulation.java
@@ -1327,7 +1327,10 @@ public final class CardEmulation {
/**
* This method is called when an AID conflict is detected during an NFC transaction. This
- * can happen when multiple services are registered for the same AID.
+ * can happen when multiple services are registered for the same AID. If your service is
+ * registered for this AID you may want to instruct users to bring your app to the
+ * foreground and ensure you call {@link #setPreferredService(Activity, ComponentName)}
+ * to ensure the transaction is routed to your service.
*
* @param aid The AID that is in conflict
*/