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

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

Merge "Ensure polling loop filters are upper case when adding to the map." into main am: 58d256e4 

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



Change-Id: I3c6e48f552405efdd9452d2e024482170f055dc8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f89d10cf 58d256e4

nfc-non-updatable/java/android/nfc/cardemulation/ApduServiceInfo.java

+3 −2
Original line number Diff line number Diff line
@@ -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);

    }



    /**