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

Only movedex() when working with apps-on-SD.

Browse Source 
Partial revert of earlier change that tried doing movedex() during
a package upgrade.  Verified that the normal package upgrade path
already wipes old code as part of InstallArgs.cleanUpResourcesLI().

Change-Id: Icc5ae0d2718a0c494bfe7becf72df50c641efe1b
This commit is contained in:
Jeff Sharkey
2014-06-17 11:51:31 -07:00
parent 64d1fbfa06
commit 96f4e595ba
1 changed files with 15 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9824,7 +9824,7 @@ public class PackageManagerService extends IPackageManager.Stub {
res.returnCode = PackageManager.INSTALL_FAILED_INVALID_APK;
}
} else {
updateSettingsLI(null, newPackage, installerPackageName, null, null, res);
updateSettingsLI(newPackage, installerPackageName, null, null, res);
// delete the partially installed application. the data directory will have to be
// restored if it was already existing
if (res.returnCode != PackageManager.INSTALL_SUCCEEDED) {
@@ -9914,8 +9914,7 @@ public class PackageManagerService extends IPackageManager.Stub {
res.returnCode = PackageManager.INSTALL_FAILED_INVALID_APK;
}
} else {
updateSettingsLI(deletedPackage, newPackage, installerPackageName, allUsers,
perUserInstalled, res);
updateSettingsLI(newPackage, installerPackageName, allUsers, perUserInstalled, res);
updatedSettings = true;
}
}
@@ -10041,8 +10040,7 @@ public class PackageManagerService extends IPackageManager.Stub {
}
if (res.returnCode == PackageManager.INSTALL_SUCCEEDED) {
updateSettingsLI(deletedPackage, newPackage, installerPackageName, allUsers,
perUserInstalled, res);
updateSettingsLI(newPackage, installerPackageName, allUsers, perUserInstalled, res);
updatedSettings = true;
}
}
@@ -10068,21 +10066,12 @@ public class PackageManagerService extends IPackageManager.Stub {
}
// Utility method used to move dex files during install.
private int moveDexFilesLI(PackageParser.Package oldPackage, PackageParser.Package newPackage) {
// TODO: extend to handle splits
if ((newPackage.applicationInfo.flags & ApplicationInfo.FLAG_HAS_CODE) != 0) {
private int moveDexFilesLI(String oldCodePath, PackageParser.Package newPackage) {
if ((newPackage.applicationInfo.flags&ApplicationInfo.FLAG_HAS_CODE) != 0) {
final String instructionSet = getAppInstructionSet(newPackage.applicationInfo);
boolean moveSuccess = false;
if (oldPackage != null
&& (oldPackage.applicationInfo.flags & ApplicationInfo.FLAG_HAS_CODE) != 0) {
if (mInstaller.movedex(oldPackage.codePath, newPackage.codePath, instructionSet)
== 0) {
moveSuccess = true;
}
}
if (!moveSuccess) {
int retCode = mInstaller.movedex(oldCodePath, newPackage.codePath,
instructionSet);
if (retCode != 0) {
/*
* Programs may be lazily run through dexopt, so the
* source may not exist. However, something seems to
@@ -10091,19 +10080,17 @@ public class PackageManagerService extends IPackageManager.Stub {
* remove the target to make sure there isn't a stale
* file from a previous version of the package.
*/
if (oldPackage != null) {
mInstaller.rmdex(oldPackage.codePath, instructionSet);
}
mInstaller.rmdex(newPackage.codePath, instructionSet);
newPackage.mDexOptNeeded = true;
mInstaller.rmdex(oldCodePath, instructionSet);
mInstaller.rmdex(newPackage.codePath, instructionSet);
}
}
return PackageManager.INSTALL_SUCCEEDED;
}
private void updateSettingsLI(PackageParser.Package oldPackage,
PackageParser.Package newPackage, String installerPackageName, int[] allUsers,
boolean[] perUserInstalled, PackageInstalledInfo res) {
private void updateSettingsLI(PackageParser.Package newPackage, String installerPackageName,
int[] allUsers, boolean[] perUserInstalled,
PackageInstalledInfo res) {
String pkgName = newPackage.packageName;
synchronized (mPackages) {
//write settings. the installStatus will be incomplete at this stage.
@@ -10113,12 +10100,6 @@ public class PackageManagerService extends IPackageManager.Stub {
mSettings.writeLPr();
}
if ((res.returnCode = moveDexFilesLI(oldPackage, newPackage))
!= PackageManager.INSTALL_SUCCEEDED) {
// Discontinue if moving dex files failed.
return;
}
if (DEBUG_INSTALL) Slog.d(TAG, "New package installed in " + newPackage.codePath);
synchronized (mPackages) {
@@ -12857,15 +12838,12 @@ public class PackageManagerService extends IPackageManager.Stub {
}
if (returnCode == PackageManager.MOVE_SUCCEEDED) {
PackageParser.Package oldPackage = new PackageParser.Package(
pkg.packageName);
oldPackage.codePath = pkg.codePath;
pkg.codePath = newCodePath;
// Move dex files around
if (moveDexFilesLI(oldPackage, pkg) != PackageManager.INSTALL_SUCCEEDED) {
if (moveDexFilesLI(oldCodePath, pkg) != PackageManager.INSTALL_SUCCEEDED) {
// Moving of dex files failed. Set
// error code and abort move.
pkg.codePath = oldPackage.codePath;
pkg.codePath = oldCodePath;
returnCode = PackageManager.MOVE_FAILED_INSUFFICIENT_STORAGE;
}
}