Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dab4a553 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Add to javadoc for onAidConflictOccurred to clarify what can be done to... 

Merge "Add to javadoc for onAidConflictOccurred to clarify what can be done to recitify that error." into main
parents 23d9f8c2 555bee27

nfc/java/android/nfc/cardemulation/CardEmulation.java

+4 −1
Original line number Diff line number Diff line
@@ -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

         */