drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Delete old forward-locked apps on upgrade" into jb-dev

Browse Source
This commit is contained in:
Kenny Root
2012-06-08 09:16:40 -07:00
committed by Android (Google) Code Review
parent 4d94ecb223 84e35eadfb
commit f27f2f8f71
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
services/java/com/android/server/pm/PackageManagerService.java
View File

@ -6140,7 +6140,22 @@ public class PackageManagerService extends IPackageManager.Stub {
private InstallArgs createInstallArgs(int flags, String fullCodePath, String fullResourcePath, private InstallArgs createInstallArgs(int flags, String fullCodePath, String fullResourcePath,
String nativeLibraryPath) { String nativeLibraryPath) {
if (installOnSd(flags) || installForwardLocked(flags)) { final boolean isInAsec;
if (installOnSd(flags)) {
/* Apps on SD card are always in ASEC containers. */
isInAsec = true;
} else if (installForwardLocked(flags)
&& !fullCodePath.startsWith(mDrmAppPrivateInstallDir.getAbsolutePath())) {
/*
* Forward-locked apps are only in ASEC containers if they're the
* new style
*/
isInAsec = true;
} else {
isInAsec = false;
}
if (isInAsec) {
return new AsecInstallArgs(fullCodePath, fullResourcePath, nativeLibraryPath, return new AsecInstallArgs(fullCodePath, fullResourcePath, nativeLibraryPath,
installOnSd(flags), installForwardLocked(flags)); installOnSd(flags), installForwardLocked(flags));
} else { } else {