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

Commit eaee72c7 authored by Bob Wang's avatar Bob Wang Committed by Automerger Merge Worker
Browse files

Merge "[framework] Handle more possible route string from service." into main... 

Merge "[framework] Handle more possible route string from service." into main am: f3507faa am: 26c9ab5f

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



Change-Id: I635d1c9fb33e7515c9dcc0f8ef231480b68efb3a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dbf65784 26c9ab5f

nfc/java/android/nfc/NfcOemExtension.java

+9 −6
Original line number Diff line number Diff line
@@ -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> {