Merge "Set CPU Abis for updated system packages" into oc-mr1-dev (f4a48406) · Commits · e / os / android_frameworks_base

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

+9 −0

Original line number	Diff line number	Diff line
		@@ -9433,6 +9433,15 @@ public class PackageManagerService extends IPackageManager.Stub
		// throw an exception if we have an update to a system application, but, it's not more
		// recent than the package we've already scanned
		if (isUpdatedSystemPkg && !isUpdatedPkgBetter) {
		// Set CPU Abis to application info.
		if ((scanFlags & SCAN_FIRST_BOOT_OR_UPGRADE) != 0) {
		final String cpuAbiOverride = deriveAbiOverride(pkg.cpuAbiOverride, updatedPkg);
		derivePackageAbi(pkg, scanFile, cpuAbiOverride, false, mAppLib32InstallDir);
		} else {
		pkg.applicationInfo.primaryCpuAbi = updatedPkg.primaryCpuAbiString;
		pkg.applicationInfo.secondaryCpuAbi = updatedPkg.secondaryCpuAbiString;
		}

		throw new PackageManagerException(Log.WARN, "Package " + ps.name + " at "
		+ scanFile + " ignored: updated version " + ps.versionCode
		+ " better than this " + pkg.mVersionCode);