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

Merge "[pm] restore ABI info on system stub install after update removal" into rvc-dev

Browse Source
This commit is contained in:
Songchun Fan
2020-04-23 00:38:57 +00:00
committed by Android (Google) Code Review
parent e640f15400 4f9bf27edd
commit b387dc6ffb
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11203,8 +11203,16 @@ public class PackageManagerService extends IPackageManager.Stub
boolean needToDeriveAbi = (scanFlags & SCAN_FIRST_BOOT_OR_UPGRADE) != 0; boolean needToDeriveAbi = (scanFlags & SCAN_FIRST_BOOT_OR_UPGRADE) != 0;
if (!needToDeriveAbi) { if (!needToDeriveAbi) {
if (pkgSetting != null) { if (pkgSetting != null) {
primaryCpuAbiFromSettings = pkgSetting.primaryCpuAbiString; // TODO(b/154610922): if it is not first boot or upgrade, we should directly use
secondaryCpuAbiFromSettings = pkgSetting.secondaryCpuAbiString; // API info from existing package setting. However, stub packages currently do not
// preserve ABI info, thus the special condition check here. Remove the special
// check after we fix the stub generation.
if (pkgSetting.pkg != null && pkgSetting.pkg.isStub()) {
needToDeriveAbi = true;
} else {
primaryCpuAbiFromSettings = pkgSetting.primaryCpuAbiString;
secondaryCpuAbiFromSettings = pkgSetting.secondaryCpuAbiString;
}
} else { } else {
// Re-scanning a system package after uninstalling updates; need to derive ABI // Re-scanning a system package after uninstalling updates; need to derive ABI
needToDeriveAbi = true; needToDeriveAbi = true;