summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Winson <chiuwinson@google.com> 2020-03-24 14:19:21 -0700
committer Winson <chiuwinson@google.com> 2020-03-24 15:02:01 -0700
commitffba329f644128c29e5f09e08ee45b57c024399e (patch)
tree9256b5062bd4e0a0fb905b2c5e91250e105a3508
parente39a7b6a800c9cf49c4ca60b1392d51eff21a738 (diff)
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
-rw-r--r--services/core/java/com/android/server/pm/parsing/PackageInfoUtils.java4
1 files changed, 4 insertions, 0 deletions
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 3cc10d194dec..5a1e8e2661b8 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;