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

Commit 3317b17e authored by Koji Fukui's avatar Koji Fukui Committed by Todd Kennedy
Browse files

Set CPU Abis for updated system packages 

Symptom:
If Chrome package is updated and is disabled after reboot, all apps are
crashed when they use WebView.

Root cause:
CPU Abis for updated system packages are not set when newer version
exist. Updated system packages are not fully scanned.
But WebView can use WebViewProvider in the system Chrome package. It
refers CPU Abis and crash happens.

Solution:
Set CPU Abis even if the system package has newer updated version.

Fixes: 64926227
Fixes: 62980149
Test: Manual
Change-Id: I1ddc7be5a5b8928189410e30a0506d11279d0279
parent 15695589

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

+9 −0
Original line number Original line 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

        // 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

        // recent than the package we've already scanned

        if (isUpdatedSystemPkg && !isUpdatedPkgBetter) {

        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 "







            throw new PackageManagerException(Log.WARN, "Package " + ps.name + " at "











                    + scanFile + " ignored: updated version " + ps.versionCode







                    + scanFile + " ignored: updated version " + ps.versionCode











                    + " better than this " + pkg.mVersionCode);







                    + " better than this " + pkg.mVersionCode);