diff options
| author | 2024-10-23 20:18:34 +0000 | |
|---|---|---|
| committer | 2024-10-23 20:18:34 +0000 | |
| commit | 26c9ab5fd5666d911afa802cb83935752cb6dcc3 (patch) | |
| tree | a62bdf54c072048fccc831092d323e45b637977e | |
| parent | a3d98fda31aef8060717dea2493a48f82b9ae1ac (diff) | |
| parent | f3507faaab23f1f8d11a3b9d9b363eb972502d94 (diff) | |
Merge "[framework] Handle more possible route string from service." into main am: f3507faaab
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3316275
Change-Id: I9b9a612d67f1d19a40af7479012bb3c1d327f9bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | nfc/java/android/nfc/NfcOemExtension.java | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/nfc/java/android/nfc/NfcOemExtension.java b/nfc/java/android/nfc/NfcOemExtension.java index 905d6f68a8a0..520ba896f01f 100644 --- a/nfc/java/android/nfc/NfcOemExtension.java +++ b/nfc/java/android/nfc/NfcOemExtension.java @@ -923,12 +923,15 @@ public final class NfcOemExtension { } private @CardEmulation.ProtocolAndTechnologyRoute int routeStringToInt(String route) { - return switch (route) { - case "DH" -> PROTOCOL_AND_TECHNOLOGY_ROUTE_DH; - case "eSE" -> PROTOCOL_AND_TECHNOLOGY_ROUTE_ESE; - case "SIM" -> PROTOCOL_AND_TECHNOLOGY_ROUTE_UICC; - default -> throw new IllegalStateException("Unexpected value: " + route); - }; + if (route.equals("DH")) { + return PROTOCOL_AND_TECHNOLOGY_ROUTE_DH; + } else if (route.startsWith("eSE")) { + return PROTOCOL_AND_TECHNOLOGY_ROUTE_ESE; + } else if (route.startsWith("SIM")) { + return PROTOCOL_AND_TECHNOLOGY_ROUTE_UICC; + } else { + throw new IllegalStateException("Unexpected value: " + route); + } } private class ReceiverWrapper<T> implements Consumer<T> { |