diff options
| author | 2024-12-12 07:56:08 -0800 | |
|---|---|---|
| committer | 2024-12-12 07:56:08 -0800 | |
| commit | dab4a553078f2fc8adff9e123763db551493e6ed (patch) | |
| tree | 00e167a4f1ec496fdbdd4bfaa32d9fc18f090b65 | |
| parent | 23d9f8c24029d7bbac596341384c8ec483713a38 (diff) | |
| parent | 555bee27f52d5c012784c353a1d412d7817e8289 (diff) | |
Merge "Add to javadoc for onAidConflictOccurred to clarify what can be done to recitify that error." into main
| -rw-r--r-- | nfc/java/android/nfc/cardemulation/CardEmulation.java | 5 |
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 */ |