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

Commit 2f83d350 authored by Song Chun Fan's avatar Song Chun Fan
Browse files

[pm] Rename scanSystemPackageLI to scanPackageForInitLI 

This method is used to scan packages for initialization during boot time, not just for system packages.

Change-Id: Ie737af9764fba4675563ae70a5bfce6a7a47caf5
BUG: 355507255
FIXES: 355507255
Flag: EXEMPT renaming
parent 22dfa608

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

+4 −4
Original line number Diff line number Diff line
@@ -3813,13 +3813,13 @@ final class InstallPackageHelper { 
                // This also has the (beneficial) side effect where if a package disappears from an

                // APEX, leaving only a /data copy, it will lose its apexModuleName.

                //

                // This must be done before scanSystemPackageLI as that will throw in the case of a

                // This must be done before scanPackageForInitLI as that will throw in the case of a

                // system -> data package.

                disabledPkgSetting.setApexModuleName(activeApexInfo.apexModuleName);

            }

        }



        final Pair<ScanResult, Boolean> scanResultPair = scanSystemPackageLI(

        final Pair<ScanResult, Boolean> scanResultPair = scanPackageForInitLI(

                parsedPackage, parseFlags, scanFlags, user);

        final ScanResult scanResult = scanResultPair.first;

        boolean shouldHideSystemApp = scanResultPair.second;
@@ -4054,7 +4054,7 @@ final class InstallPackageHelper { 
        }

    }



    private Pair<ScanResult, Boolean> scanSystemPackageLI(ParsedPackage parsedPackage,

    private Pair<ScanResult, Boolean> scanPackageForInitLI(ParsedPackage parsedPackage,

            @ParsingPackageUtils.ParseFlags int parseFlags,

            @PackageManagerService.ScanFlags int scanFlags,

            @Nullable UserHandle user) throws PackageManagerException {
@@ -4167,7 +4167,7 @@ final class InstallPackageHelper { 
                        ParsingPackageUtils.getSigningDetails(input, parsedPackage,

                                false /*skipVerify*/);

                if (result.isError()) {

                    throw new PrepareFailure("Failed collect during scanSystemPackageLI",

                    throw new PrepareFailure("Failed collect during scanPackageForInitLI",

                            result.getException());

                }

                disabledPkgSetting.setSigningDetails(result.getResult());