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

Merge "Add installerSource to packageSetting earlier" into rvc-dev

Browse Source
This commit is contained in:
Patrick Baumann
2020-07-01 14:53:10 +00:00
committed by Android (Google) Code Review
parent 64ab1a4fb2 8b811f2d2a
commit 93b7187b08
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -11083,6 +11083,21 @@ public class PackageManagerService extends IPackageManager.Stub
pkgSetting.forceQueryableOverride = true; pkgSetting.forceQueryableOverride = true;
} }
// If this is part of a standard install, set the initiating package name, else rely on
// previous device state.
if (reconciledPkg.installArgs != null) {
InstallSource installSource = reconciledPkg.installArgs.installSource;
if (installSource.initiatingPackageName != null) {
final PackageSetting ips = mSettings.mPackages.get(
installSource.initiatingPackageName);
if (ips != null) {
installSource = installSource.setInitiatingPackageSignatures(
ips.signatures);
}
}
pkgSetting.setInstallSource(installSource);
}
// TODO(toddke): Consider a method specifically for modifying the Package object // TODO(toddke): Consider a method specifically for modifying the Package object
// post scan; or, moving this stuff out of the Package object since it has nothing // post scan; or, moving this stuff out of the Package object since it has nothing
// to do with the package on disk. // to do with the package on disk.
@@ -16089,16 +16104,7 @@ public class PackageManagerService extends IPackageManager.Stub
ps.setEnabled(COMPONENT_ENABLED_STATE_DEFAULT, userId, installerPackageName); ps.setEnabled(COMPONENT_ENABLED_STATE_DEFAULT, userId, installerPackageName);
} }
if (installSource.initiatingPackageName != null) { mSettings.addInstallerPackageNames(ps.installSource);
final PackageSetting ips = mSettings.mPackages.get(
installSource.initiatingPackageName);
if (ips != null) {
installSource = installSource.setInitiatingPackageSignatures(
ips.signatures);
}
}
ps.setInstallSource(installSource);
mSettings.addInstallerPackageNames(installSource);
// When replacing an existing package, preserve the original install reason for all // When replacing an existing package, preserve the original install reason for all
// users that had the package installed before. Similarly for uninstall reasons. // users that had the package installed before. Similarly for uninstall reasons.