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

Merge "PackageManager: Clear foreign-dex markers when the app is uninstalled." into nyc-dev

Browse Source
This commit is contained in:
Narayan Kamath
2016-05-17 08:31:42 +00:00
committed by Android (Google) Code Review
parent c19cf44966 1475701100
commit a8b4f75978
1 changed files with 56 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2724,6 +2724,7 @@ public class PackageManagerService extends IPackageManager.Stub {
StorageManager.FLAG_STORAGE_DE | StorageManager.FLAG_STORAGE_CE
| Installer.FLAG_CLEAR_CODE_CACHE_ONLY);
}
clearAppProfilesLIF(ps.pkg, UserHandle.USER_ALL);
}
ver.fingerprint = Build.FINGERPRINT;
}
@@ -7581,15 +7582,61 @@ public class PackageManagerService extends IPackageManager.Stub {
}
}
private void destroyAppProfilesLIF(PackageParser.Package pkg) {
private void destroyAppProfilesLIF(PackageParser.Package pkg, int userId) {
if (pkg == null) {
Slog.wtf(TAG, "Package was null!", new Throwable());
return;
}
destroyAppProfilesLeafLIF(pkg);
destroyAppReferenceProfileLeafLIF(pkg, userId);
final int childCount = (pkg.childPackages != null) ? pkg.childPackages.size() : 0;
for (int i = 0; i < childCount; i++) {
destroyAppProfilesLeafLIF(pkg.childPackages.get(i));
destroyAppReferenceProfileLeafLIF(pkg.childPackages.get(i), userId);
}
}
private void destroyAppReferenceProfileLeafLIF(PackageParser.Package pkg, int userId) {
if (pkg.isForwardLocked()) {
return;
}
for (String path : pkg.getAllCodePathsExcludingResourceOnly()) {
try {
path = new File(path).getCanonicalPath();
} catch (IOException e) {
// TODO: Should we return early here ?
Slog.w(TAG, "Failed to get canonical path", e);
}
final String useMarker = path.replace('/', '@');
for (int realUserId : resolveUserIds(userId)) {
File profileDir = Environment.getDataProfilesDeForeignDexDirectory(realUserId);
File foreignUseMark = new File(profileDir, useMarker);
if (foreignUseMark.exists()) {
if (!foreignUseMark.delete()) {
Slog.w(TAG, "Unable to delete foreign user mark for package: "
+ pkg.packageName);
}
}
File[] markers = profileDir.listFiles();
if (markers != null) {
final String searchString = "@" + pkg.packageName + "@";
// We also delete all markers that contain the package name we're
// uninstalling. These are associated with secondary dex-files belonging
// to the package. Reconstructing the path of these dex files is messy
// in general.
for (File marker : markers) {
if (marker.getName().indexOf(searchString) > 0) {
if (!marker.delete()) {
Slog.w(TAG, "Unable to delete foreign user mark for package: "
+ pkg.packageName);
}
}
}
}
}
}
}
@@ -7601,12 +7648,13 @@ public class PackageManagerService extends IPackageManager.Stub {
}
}
private void clearAppProfilesLIF(PackageParser.Package pkg) {
private void clearAppProfilesLIF(PackageParser.Package pkg, int userId) {
if (pkg == null) {
Slog.wtf(TAG, "Package was null!", new Throwable());
return;
}
clearAppProfilesLeafLIF(pkg);
destroyAppReferenceProfileLeafLIF(pkg, userId);
final int childCount = (pkg.childPackages != null) ? pkg.childPackages.size() : 0;
for (int i = 0; i < childCount; i++) {
clearAppProfilesLeafLIF(pkg.childPackages.get(i));
@@ -7810,7 +7858,7 @@ public class PackageManagerService extends IPackageManager.Stub {
// DELETE_DATA_ON_FAILURES is only used by frozen paths
destroyAppDataLIF(pkg, UserHandle.USER_ALL,
StorageManager.FLAG_STORAGE_DE | StorageManager.FLAG_STORAGE_CE);
destroyAppProfilesLIF(pkg);
destroyAppProfilesLIF(pkg, UserHandle.USER_ALL);
}
}
}
@@ -14158,7 +14206,7 @@ public class PackageManagerService extends IPackageManager.Stub {
clearAppDataLIF(pkg, UserHandle.USER_ALL, StorageManager.FLAG_STORAGE_DE
| StorageManager.FLAG_STORAGE_CE | Installer.FLAG_CLEAR_CODE_CACHE_ONLY);
clearAppProfilesLIF(pkg);
clearAppProfilesLIF(deletedPackage, UserHandle.USER_ALL);
try {
final PackageParser.Package newPackage = scanPackageTracedLI(pkg, policyFlags,
@@ -14284,7 +14332,7 @@ public class PackageManagerService extends IPackageManager.Stub {
// Successfully disabled the old package. Now proceed with re-installation
clearAppDataLIF(pkg, UserHandle.USER_ALL, StorageManager.FLAG_STORAGE_DE
| StorageManager.FLAG_STORAGE_CE | Installer.FLAG_CLEAR_CODE_CACHE_ONLY);
clearAppProfilesLIF(pkg);
clearAppProfilesLIF(deletedPackage, UserHandle.USER_ALL);
res.setReturnCode(PackageManager.INSTALL_SUCCEEDED);
pkg.setApplicationInfoFlags(ApplicationInfo.FLAG_UPDATED_SYSTEM_APP,
@@ -15528,7 +15576,7 @@ public class PackageManagerService extends IPackageManager.Stub {
}
destroyAppDataLIF(resolvedPkg, UserHandle.USER_ALL,
StorageManager.FLAG_STORAGE_DE | StorageManager.FLAG_STORAGE_CE);
destroyAppProfilesLIF(resolvedPkg);
destroyAppProfilesLIF(resolvedPkg, UserHandle.USER_ALL);
if (outInfo != null) {
outInfo.dataRemoved = true;
}
@@ -16063,6 +16111,7 @@ public class PackageManagerService extends IPackageManager.Stub {
destroyAppDataLIF(pkg, userId,
StorageManager.FLAG_STORAGE_DE | StorageManager.FLAG_STORAGE_CE);
destroyAppProfilesLIF(pkg, userId);
removeKeystoreDataIfNeeded(nextUserId, ps.appId);
schedulePackageCleaning(ps.name, nextUserId, false);
synchronized (mPackages) {
@@ -16168,7 +16217,7 @@ public class PackageManagerService extends IPackageManager.Stub {
try (PackageFreezer freezer = freezePackage(packageName, "clearApplicationProfileData")) {
synchronized (mInstallLock) {
clearAppProfilesLIF(pkg);
clearAppProfilesLIF(pkg, UserHandle.USER_ALL);
}
}
}