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

Commit 527dfdfa authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android Git Automerger
Browse files

am d4dc8756: am 4524184c: am f811d7fc: am fe7a311c: am 35ba2cdb: Merge... 

am d4dc8756: am 4524184c: am f811d7fc: am fe7a311c: am 35ba2cdb: Merge "Inherit ABI when moving existing install." into mnc-dev

* commit 'd4dc8756':
  Inherit ABI when moving existing install.
parents bd04eaa9 d4dc8756

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

+14 −0
Original line number Diff line number Diff line
@@ -12273,6 +12273,20 @@ public class PackageManagerService extends IPackageManager.Stub { 
            // We did an in-place move, so dex is ready to roll

            scanFlags |= SCAN_NO_DEX;

            scanFlags |= SCAN_MOVE;













            synchronized (mPackages) {













                final PackageSetting ps = mSettings.mPackages.get(pkgName);













                if (ps == null) {













                    res.setError(INSTALL_FAILED_INTERNAL_ERROR,













                            "Missing settings for moved package " + pkgName);













                }

























                // We moved the entire application as-is, so bring over the













                // previously derived ABI information.













                pkg.applicationInfo.primaryCpuAbi = ps.primaryCpuAbiString;













                pkg.applicationInfo.secondaryCpuAbi = ps.secondaryCpuAbiString;













            }



























        } else if (!forwardLocked && !pkg.applicationInfo.isExternalAsec()) {















            // Enable SCAN_NO_DEX flag to skip dexopt at a later stage















            scanFlags |= SCAN_NO_DEX;