Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add all shared info libraries in first pass" into udc-dev

Browse Source
This commit is contained in:
Alex Buynytskyy
2023-03-16 19:28:49 +00:00
committed by Android (Google) Code Review
parent 2c50b9f7e2 c1267a3b4c
commit 5a3cfb6069
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/pm/ReconcilePackageUtils.java
View File

@@ -69,7 +69,6 @@ final class ReconcilePackageUtils {
for (InstallRequest installRequest : installRequests) {
installRequest.onReconcileStarted();
final String installPackageName = installRequest.getParsedPackage().getPackageName();
// add / replace existing with incoming packages
combinedPackages.put(installRequest.getScannedPackageSetting().getPackageName(),
@@ -84,12 +83,17 @@ final class ReconcilePackageUtils {
incomingSharedLibraries, info)) {
throw ReconcileFailure.ofInternalError(
"Shared Library " + info.getName()
+ " is being installed twice in this set!",
+ " is being installed twice in this set!",
PackageManagerException.INTERNAL_ERROR_SHARED_LIB_INSTALLED_TWICE);
}
}
}
}
for (InstallRequest installRequest : installRequests) {
final String installPackageName = installRequest.getParsedPackage().getPackageName();
final List<SharedLibraryInfo> allowedSharedLibInfos =
sharedLibraries.getAllowedSharedLibInfos(installRequest);
final DeletePackageAction deletePackageAction;
// we only want to try to delete for non system apps