Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Songchun Fan
2020-08-13 22:44:33 +00:00
committed by Android (Google) Code Review
parent f5375c52ea 1476c298d5
commit 8a482a1bca
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -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) {