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

Merge "Do not kill apps dependending on static shared lib"

Browse Source
This commit is contained in:
Rhed Jao
2021-11-25 02:20:52 +00:00
committed by Android (Google) Code Review
parent 483f47f640 1b34775332
commit 53f9d3b15e
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
services/core/java/com/android/server/pm/InstallPackageHelper.java
View File

@@ -649,12 +649,17 @@ final class InstallPackageHelper {
mPm.checkPackageFrozen(pkgName);
}
// Also need to kill any apps that are dependent on the library.
final boolean isReplace =
reconciledPkg.mPrepareResult != null && reconciledPkg.mPrepareResult.mReplace;
// Also need to kill any apps that are dependent on the library, except the case of
// installation of new version static shared library.
if (clientLibPkgs != null) {
for (int i = 0; i < clientLibPkgs.size(); i++) {
AndroidPackage clientPkg = clientLibPkgs.get(i);
mPm.killApplication(clientPkg.getPackageName(),
clientPkg.getUid(), "update lib");
if (pkg.getStaticSharedLibName() == null || isReplace) {
for (int i = 0; i < clientLibPkgs.size(); i++) {
AndroidPackage clientPkg = clientLibPkgs.get(i);
mPm.killApplication(clientPkg.getPackageName(),
clientPkg.getUid(), "update lib");
}
}
}
@@ -676,8 +681,6 @@ final class InstallPackageHelper {
ksms.addScannedPackageLPw(pkg);
mPm.mComponentResolver.addAllComponents(pkg, chatty);
final boolean isReplace =
reconciledPkg.mPrepareResult != null && reconciledPkg.mPrepareResult.mReplace;
mPm.mAppsFilter.addPackage(pkgSetting, isReplace);
mPm.addAllPackageProperties(pkg);
@@ -3129,10 +3132,12 @@ final class InstallPackageHelper {
true, true, pkgList, uidArray, null);
}
} else if (!ArrayUtils.isEmpty(res.mLibraryConsumers)) { // if static shared lib
// No need to kill consumers if it's installation of new version static shared lib.
final boolean dontKillApp = !update && res.mPkg.getStaticSharedLibName() != null;
for (int i = 0; i < res.mLibraryConsumers.size(); i++) {
AndroidPackage pkg = res.mLibraryConsumers.get(i);
// send broadcast that all consumers of the static shared library have changed
mPm.sendPackageChangedBroadcast(pkg.getPackageName(), false /* dontKillApp */,
mPm.sendPackageChangedBroadcast(pkg.getPackageName(), dontKillApp,
new ArrayList<>(Collections.singletonList(pkg.getPackageName())),
pkg.getUid(), null);
}