am 625b92fc: am f27f2f8f: Merge "Delete old forward-locked apps on upgrade" into jb-dev (f8dc339a) · Commits · e / os / android_frameworks_base

services/java/com/android/server/pm/PackageManagerService.java

+16 −1

Original line number	Diff line number	Diff line
		@@ -6185,7 +6185,22 @@ public class PackageManagerService extends IPackageManager.Stub {

		private InstallArgs createInstallArgs(int flags, String fullCodePath, String fullResourcePath,
		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,
		installOnSd(flags), installForwardLocked(flags));
		} else {