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

Commit 8a482a1b authored by Songchun Fan's avatar Songchun Fan Committed by Android (Google) Code Review
Browse files

Merge "[pm] ignore old value of abiOverride in pkgSetting when installing"

parents f5375c52 1476c298

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

+1 −4
Original line number Diff line number Diff line
@@ -17591,9 +17591,6 @@ public class PackageManagerService extends IPackageManager.Stub 
                synchronized (mLock) {

                    pkgSetting = mSettings.getPackageLPr(pkgName);

                }

                String abiOverride =

                        (pkgSetting == null || TextUtils.isEmpty(pkgSetting.cpuAbiOverrideString)

                        ? args.abiOverride : pkgSetting.cpuAbiOverrideString);

                boolean isUpdatedSystemAppFromExistingSetting = pkgSetting != null

                        && pkgSetting.getPkgState().isUpdatedSystemApp();

                AndroidPackage oldPackage = mPackages.get(pkgName);
@@ -17601,7 +17598,7 @@ public class PackageManagerService extends IPackageManager.Stub 
                final Pair<PackageAbiHelper.Abis, PackageAbiHelper.NativeLibraryPaths>

                        derivedAbi = mInjector.getAbiHelper().derivePackageAbi(parsedPackage,

                        isUpdatedSystemAppFromExistingSetting || isUpdatedSystemAppInferred,

                        abiOverride);

                        args.abiOverride);

                derivedAbi.first.applyTo(parsedPackage);

                derivedAbi.second.applyTo(parsedPackage);

            } catch (PackageManagerException pme) {