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

Commit cfb360be authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[pm] Rename scanSystemPackageLI to scanPackageForInitLI" into main

parents aebefab4 2f83d350
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -3825,13 +3825,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;
@@ -4066,7 +4066,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 {
@@ -4179,7 +4179,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());