summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Song Chun Fan <schfan@google.com> 2024-07-25 23:14:39 +0000
committer Song Chun Fan <schfan@google.com> 2024-07-25 23:14:39 +0000
commit2f83d350e8ed93cfe85c27e3f17fe23a1b98c58a (patch)
tree1a8c5e18d89f7e3556d307db5fc5f30ce3dbe2b9
parent22dfa608cfcc079b5fd9ee7e661aa5836f5be32a (diff)
[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
-rw-r--r--services/core/java/com/android/server/pm/InstallPackageHelper.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/services/core/java/com/android/server/pm/InstallPackageHelper.java b/services/core/java/com/android/server/pm/InstallPackageHelper.java
index 8d3f07edb687..9cbd52db9f2c 100644
--- a/services/core/java/com/android/server/pm/InstallPackageHelper.java
+++ b/services/core/java/com/android/server/pm/InstallPackageHelper.java
@@ -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());