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

Commit 7532b5d8 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Added dynamic route location update support for type-F technology... 

Merge "Added dynamic route location update support for type-F technology through overrideRoutingTable API." into main am: ef19a5d7 am: 460bda4e

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3175539



Change-Id: I6cc24b0b5bc3e03202b3d72d32902b3c10e6a78f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8f10c8fe 460bda4e

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

+2 −1
Original line number Diff line number Diff line
@@ -914,7 +914,8 @@ public final class CardEmulation { 
      * otherwise a call to this method will fail and throw {@link SecurityException}.

      * @param activity The Activity that requests NFC controller routing table to be changed.

      * @param protocol ISO-DEP route destination, which can be "DH" or "UICC" or "ESE".

      * @param technology Tech-A, Tech-B route destination, which can be "DH" or "UICC" or "ESE".

      * @param technology Tech-A, Tech-B and Tech-F route destination, which can be "DH" or "UICC"

      * or "ESE".

      * @throws SecurityException if the caller is not the preferred NFC service

      * @throws IllegalArgumentException if the activity is not resumed or the caller is not in the

      * foreground, or both protocol route and technology route are null.