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

Remove then add during replace to reset vis

Browse Source 
This change adds a special case to remove a package from the apps filter
just before adding it during a replace action to ensure we wipe any
no-longer-valid visibility grants. This was broken when we moved the
removePackage call to account for packages that are removed with
KEEP_DATA set. To account for both scenarios, we added make an
additional call for the replace case.

Fixes: 159732800
Test: atest AppEnumerationTests
Change-Id: I031c634986b0666163f0292070be31c33461b9bc
This commit is contained in:
Patrick Baumann
2020-06-23 13:07:55 -07:00
parent 8d139f6a98
commit 88c11506df
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
services/core/java/com/android/server/pm/AppsFilter.java
View File

@@ -495,10 +495,15 @@ public class AppsFilter {
* Adds a package that should be considered when filtering visibility between apps.
*
* @param newPkgSetting the new setting being added
* @param isReplace if the package is being replaced and may need extra cleanup.
*/
public void addPackage(PackageSetting newPkgSetting) {
public void addPackage(PackageSetting newPkgSetting, boolean isReplace) {
Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "filter.addPackage");
try {
if (isReplace) {
// let's first remove any prior rules for this package
removePackage(newPkgSetting);
}
mStateProvider.runWithState((settings, users) -> {
addPackageInternal(newPkgSetting, settings);
if (mShouldFilterCache != null) {
@@ -776,6 +781,15 @@ public class AppsFilter {
return result;
}
/**
* Equivalent to calling {@link #addPackage(PackageSetting, boolean)} with {@code isReplace}
* equal to {@code false}.
* @see AppsFilter#addPackage(PackageSetting, boolean)
*/
public void addPackage(PackageSetting newPkgSetting) {
addPackage(newPkgSetting, false /* isReplace */);
}
/**
* Removes a package for consideration when filtering visibility between apps.
*

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

@@ -12366,7 +12366,9 @@ public class PackageManagerService extends IPackageManager.Stub
ksms.addScannedPackageLPw(pkg);
mComponentResolver.addAllComponents(pkg, chatty);
mAppsFilter.addPackage(pkgSetting);
final boolean isReplace =
reconciledPkg.prepareResult != null && reconciledPkg.prepareResult.replace;
mAppsFilter.addPackage(pkgSetting, isReplace);
// Don't allow ephemeral applications to define new permissions groups.
if ((scanFlags & SCAN_AS_INSTANT_APP) != 0) {