From 555bee27f52d5c012784c353a1d412d7817e8289 Mon Sep 17 00:00:00 2001 From: Brad Lassey Date: Tue, 10 Dec 2024 17:43:52 -0500 Subject: 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 --- nfc/java/android/nfc/cardemulation/CardEmulation.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 */ -- cgit v1.2.3-59-g8ed1b