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

Commit 12c292e9 authored by Bookatz's avatar Bookatz
Browse files

UserSystemPackageInstaller intern packageNames 

UserSystemPackageInstaller obtains a list of package names
from a sysconfig file (the whitelist) at boot time.
But package names are already interned in PackageParser.
So we should intern the package names here too to save memory.

Bug: 134605778
Test: atest UserSystemPackageInstallerTest
Change-Id: Icf519473122f6b758749286b5efa8989c6b5ee60
parent bbf394bf

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

+2 −2
Original line number Diff line number Diff line
@@ -382,7 +382,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);
@@ -395,7 +395,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) {