diff options
| author | 2025-02-11 07:49:33 -0800 | |
|---|---|---|
| committer | 2025-02-11 07:49:33 -0800 | |
| commit | a133ccc97a313645b81b59890abc806f4dd7f07c (patch) | |
| tree | 5c01334777c339396881fa7ad2bf648569854602 | |
| parent | f89d10cf947e437eb141a834ea64ca7c9e954d48 (diff) | |
| parent | 58d256e4c9d5c0eabe880e84ac05f0374c910163 (diff) | |
Merge "Ensure polling loop filters are upper case when adding to the map." into main am: 58d256e4c9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3486531
Change-Id: I3c6e48f552405efdd9452d2e024482170f055dc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | nfc-non-updatable/java/android/nfc/cardemulation/ApduServiceInfo.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/nfc-non-updatable/java/android/nfc/cardemulation/ApduServiceInfo.java b/nfc-non-updatable/java/android/nfc/cardemulation/ApduServiceInfo.java index e83b9f1afddb..d0de1fc14b0e 100644 --- a/nfc-non-updatable/java/android/nfc/cardemulation/ApduServiceInfo.java +++ b/nfc-non-updatable/java/android/nfc/cardemulation/ApduServiceInfo.java @@ -817,7 +817,7 @@ public final class ApduServiceInfo implements Parcelable { if (!mOnHost && !autoTransact) { return; } - mAutoTransact.put(pollingLoopFilter, autoTransact); + mAutoTransact.put(pollingLoopFilter.toUpperCase(Locale.ROOT), autoTransact); } /** @@ -845,7 +845,8 @@ public final class ApduServiceInfo implements Parcelable { if (!mOnHost && !autoTransact) { return; } - mAutoTransactPatterns.put(Pattern.compile(pollingLoopPatternFilter), autoTransact); + mAutoTransactPatterns.put(Pattern.compile( + pollingLoopPatternFilter.toUpperCase(Locale.ROOT)), autoTransact); } /** |