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

Merge "Fix a bug in UserSystemPackageInstaller#installWhitelistedSystemPackages"

Browse Source
This commit is contained in:
BK Choi
2022-07-27 19:55:03 +00:00
committed by Android (Google) Code Review
parent f40a743ceb 2fce090146
commit 0f517fbda9
1 changed files with 13 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
services/core/java/com/android/server/pm/UserSystemPackageInstaller.java
View File

@@ -219,38 +219,21 @@ class UserSystemPackageInstaller {
// Install/uninstall system packages per user.
for (int userId : mUm.getUserIds()) {
final Set<String> userWhitelist = getInstallablePackagesForUserId(userId);
final Set<String> userAllowlist = getInstallablePackagesForUserId(userId);
// If null, run for all packages
if (userWhitelist == null) {
pmInt.forEachPackageState(packageState -> {
if (packageState.getPkg() == null) {
return;
}
final boolean install = !packageState.getTransientState()
.isHiddenUntilInstalled();
if (packageState.getUserStateOrDefault(userId).isInstalled() != install
&& shouldChangeInstallationState(packageState, install, userId,
isFirstBoot, isConsideredUpgrade, preExistingPackages)) {
changesToCommit.add(userId, packageState.getPackageName(), install);
}
});
} else {
for (String packageName : userWhitelist) {
PackageStateInternal packageState = pmInt.getPackageStateInternal(packageName);
if (packageState.getPkg() == null) {
continue;
}
final boolean install = !packageState.getTransientState()
.isHiddenUntilInstalled();
if (packageState.getUserStateOrDefault(userId).isInstalled() != install
&& shouldChangeInstallationState(packageState, install, userId,
isFirstBoot, isConsideredUpgrade, preExistingPackages)) {
changesToCommit.add(userId, packageState.getPackageName(), install);
}
pmInt.forEachPackageState(packageState -> {
if (packageState.getPkg() == null) {
return;
}
}
boolean install = (userAllowlist == null
|| userAllowlist.contains(packageState.getPackageName()))
&& !packageState.getTransientState().isHiddenUntilInstalled();
if (packageState.getUserStateOrDefault(userId).isInstalled() != install
&& shouldChangeInstallationState(packageState, install, userId,
isFirstBoot, isConsideredUpgrade, preExistingPackages)) {
changesToCommit.add(userId, packageState.getPackageName(), install);
}
});
}
pmInt.commitPackageStateMutation(null, packageStateMutator -> {