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

Commit 930aad0d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "UserSystemPackageInstaller intern packageNames"

parents 772aaff3 12c292e9

services/core/java/com/android/server/pm/UserSystemPackageInstaller.java

+2 −2
Original line number Diff line number Diff line
@@ -389,7 +389,7 @@ class UserSystemPackageInstaller { 
        final ArrayMap<String, Integer> result = new ArrayMap<>(whitelist.size() + 1);

        // First, do the whitelisted user types.

        for (int i = 0; i < whitelist.size(); i++) {

            final String pkgName = whitelist.keyAt(i);

            final String pkgName = whitelist.keyAt(i).intern();

            final int flags = getFlagsFromUserTypes(whitelist.valueAt(i));

            if (flags != 0) {

                result.put(pkgName, flags);
@@ -402,7 +402,7 @@ class UserSystemPackageInstaller { 
        final ArrayMap<String, Set<String>> blacklist =

                sysConfig.getAndClearPackageToUserTypeBlacklist();

        for (int i = 0; i < blacklist.size(); i++) {

            final String pkgName = blacklist.keyAt(i);

            final String pkgName = blacklist.keyAt(i).intern();

            final int nonFlags = getFlagsFromUserTypes(blacklist.valueAt(i));

            final Integer flags = result.get(pkgName);

            if (flags != null) {