diff options
| author | 2024-08-16 18:19:43 +0000 | |
|---|---|---|
| committer | 2024-08-16 18:19:43 +0000 | |
| commit | 7532b5d894c7d8b8c6935e97ff3a620bcdfe739f (patch) | |
| tree | 9368487ae87a2ff97fde4ae799e97f8af3caa189 | |
| parent | 8f10c8fed0bae327453b87c33ed8b7d61e6babbd (diff) | |
| parent | 460bda4ef359b3eb91d2460e3750d1bc99614d3d (diff) | |
Merge "Added dynamic route location update support for type-F technology through overrideRoutingTable API." into main am: ef19a5d771 am: 460bda4ef3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3175539
Change-Id: I6cc24b0b5bc3e03202b3d72d32902b3c10e6a78f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | nfc/java/android/nfc/cardemulation/CardEmulation.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nfc/java/android/nfc/cardemulation/CardEmulation.java b/nfc/java/android/nfc/cardemulation/CardEmulation.java index 03372b206f48..0605dbe130d3 100644 --- a/nfc/java/android/nfc/cardemulation/CardEmulation.java +++ b/nfc/java/android/nfc/cardemulation/CardEmulation.java @@ -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. |