From ffba329f644128c29e5f09e08ee45b57c024399e Mon Sep 17 00:00:00 2001 From: Winson Date: Tue, 24 Mar 2020 14:19:21 -0700 Subject: [PATCH] Assign missing stateful fields in PackageInfoUtils These are fields that were moved from AndroidPackage into PackageSetting and thus have to be assigned from that PackageSetting whenever an ApplicationInfo object is generated. Affected fields are seInfo, primaryCpuAbi, and secondaryCpuAbi. Bug: 152339899 Test: manual adb shell am compat disable 143539591 com.example.app for test app and verify enable/disable Change-Id: I0b135554de4420066dc74d0571416547f0557eef --- .../java/com/android/server/pm/parsing/PackageInfoUtils.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/services/core/java/com/android/server/pm/parsing/PackageInfoUtils.java b/services/core/java/com/android/server/pm/parsing/PackageInfoUtils.java index 3cc10d194dece..5a1e8e2661b8d 100644 --- a/services/core/java/com/android/server/pm/parsing/PackageInfoUtils.java +++ b/services/core/java/com/android/server/pm/parsing/PackageInfoUtils.java @@ -230,6 +230,10 @@ public class PackageInfoUtils { info.sharedLibraryInfos = usesLibraryInfos.isEmpty() ? null : usesLibraryInfos; } + info.seInfo = AndroidPackageUtils.getSeInfo(pkg, pkgSetting); + info.primaryCpuAbi = AndroidPackageUtils.getPrimaryCpuAbi(pkg, pkgSetting); + info.secondaryCpuAbi = AndroidPackageUtils.getSecondaryCpuAbi(pkg, pkgSetting); + info.flags |= appInfoFlags(pkg, pkgSetting); info.privateFlags |= appInfoPrivateFlags(pkg, pkgSetting); return info;