Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5bd27d25 authored by Todd Kennedy's avatar Todd Kennedy Committed by android-build-merger
Browse files

Merge "Set CPU Abis for updated system packages" into oc-mr1-dev am: f4a48406 

am: 269cdab3

Change-Id: I6e03aaa9fdc44dd3ceda2d27a946af0dd66f7dd1
parents c283ba74 269cdab3

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);