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

Commit 7717567b authored by Omer Ozer's avatar Omer Ozer Committed by Android Build Cherrypicker Worker
Browse files

Use a TreeMap for PL patterns so that they are 

sorted and hashed properly.

Bug: 376078215
Flag: EXEMPT bugfix
Test: atest CtsNfcTestCases
Merged-In: I9a473bcfead84047a18a5c85da5886799069ed02
Change-Id: I9a473bcfead84047a18a5c85da5886799069ed02
parent c6faa6b9

nfc/java/android/nfc/cardemulation/ApduServiceInfo.java

+6 −2
Original line number Original line Diff line number Diff line
@@ -52,10 +52,12 @@ import org.xmlpull.v1.XmlPullParserException; 
import java.io.IOException;

import java.io.IOException;

import java.io.PrintWriter;

import java.io.PrintWriter;

import java.util.ArrayList;

import java.util.ArrayList;

import java.util.Comparator;

import java.util.HashMap;

import java.util.HashMap;

import java.util.List;

import java.util.List;

import java.util.Locale;

import java.util.Locale;

import java.util.Map;

import java.util.Map;

import java.util.TreeMap;

import java.util.regex.Pattern;

import java.util.regex.Pattern;





/**

/**
@@ -181,7 +183,8 @@ public final class ApduServiceInfo implements Parcelable { 
        this(info, onHost, description, staticAidGroups, dynamicAidGroups,

        this(info, onHost, description, staticAidGroups, dynamicAidGroups,

                requiresUnlock, requiresScreenOn, bannerResource, uid,

                requiresUnlock, requiresScreenOn, bannerResource, uid,

                settingsActivityName, offHost, staticOffHost, isEnabled,

                settingsActivityName, offHost, staticOffHost, isEnabled,

                new HashMap<String, Boolean>(), new HashMap<Pattern, Boolean>());

                new HashMap<String, Boolean>(), new TreeMap<>(

                        Comparator.comparing(Pattern::toString)));

    }

    }





    /**

    /**
@@ -317,7 +320,8 @@ public final class ApduServiceInfo implements Parcelable { 
            mStaticAidGroups = new HashMap<String, AidGroup>();

            mStaticAidGroups = new HashMap<String, AidGroup>();

            mDynamicAidGroups = new HashMap<String, AidGroup>();

            mDynamicAidGroups = new HashMap<String, AidGroup>();

            mAutoTransact = new HashMap<String, Boolean>();

            mAutoTransact = new HashMap<String, Boolean>();

            mAutoTransactPatterns = new HashMap<Pattern, Boolean>();

            mAutoTransactPatterns = new TreeMap<Pattern, Boolean>(

                    Comparator.comparing(Pattern::toString));

            mOnHost = onHost;

            mOnHost = onHost;





            final int depth = parser.getDepth();

            final int depth = parser.getDepth();