diff options
| author | 2024-12-12 08:58:01 -0800 | |
|---|---|---|
| committer | 2024-12-12 08:58:01 -0800 | |
| commit | b5d00aeb283d816669c6fc8c47537cab148defdf (patch) | |
| tree | 152c966b134ed763808635fa732db33de4f55c13 | |
| parent | e662626f71064fbbffa2375195237942bc491972 (diff) | |
| parent | dab4a553078f2fc8adff9e123763db551493e6ed (diff) | |
Merge "Add to javadoc for onAidConflictOccurred to clarify what can be done to recitify that error." into main am: dab4a55307
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3402988
Change-Id: I68a4a8c3e295436ffde602910f74751de5b34bfd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -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 */ |