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

Commit cc51fccd authored by Omer Ozer's avatar Omer Ozer Committed by Automerger Merge Worker
Browse files

Merge "Use a TreeMap for PL patterns so that they are sorted and hashed...

Merge "Use a TreeMap for PL patterns so that they are sorted and hashed properly." into main am: d0913b5b am: 46e37f4a

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



Change-Id: I819083c22de74d279aa8a5b8122076164e313d78
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 117654a8 46e37f4a
Loading
Loading
Loading
Loading
+6 −2
Original line number Diff line number Diff line
@@ -52,10 +52,12 @@ import org.xmlpull.v1.XmlPullParserException;
import java.io.IOException;
import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.TreeMap;
import java.util.regex.Pattern;

/**
@@ -204,7 +206,8 @@ public final class ApduServiceInfo implements Parcelable {
        this(info, onHost, description, staticAidGroups, dynamicAidGroups,
                requiresUnlock, requiresScreenOn, bannerResource, uid,
                settingsActivityName, offHost, staticOffHost, isEnabled,
                new HashMap<String, Boolean>(), new HashMap<Pattern, Boolean>());
                new HashMap<String, Boolean>(), new TreeMap<>(
                        Comparator.comparing(Pattern::toString)));
    }

    /**
@@ -340,7 +343,8 @@ public final class ApduServiceInfo implements Parcelable {
            mStaticAidGroups = new HashMap<String, AidGroup>();
            mDynamicAidGroups = new HashMap<String, AidGroup>();
            mAutoTransact = new HashMap<String, Boolean>();
            mAutoTransactPatterns = new HashMap<Pattern, Boolean>();
            mAutoTransactPatterns = new TreeMap<Pattern, Boolean>(
                    Comparator.comparing(Pattern::toString));
            mOnHost = onHost;

            final int depth = parser.getDepth();