Merge "Set FLAG_UPDATED_SYSTEM_APP properly for APEX packages"

1 files changed, 2 insertions, 0 deletions

diff --git a/core/java/android/content/pm/parsing/PackageInfoWithoutStateUtils.java b/core/java/android/content/pm/parsing/PackageInfoWithoutStateUtils.java
index 056af776a53b..f8fd4a539334 100644
--- a/core/java/android/content/pm/parsing/PackageInfoWithoutStateUtils.java
+++ b/core/java/android/content/pm/parsing/PackageInfoWithoutStateUtils.java
@@ -295,8 +295,10 @@ public class PackageInfoWithoutStateUtils {
             pi.applicationInfo.publicSourceDir = apexFile.getPath();
             if (apexInfo.isFactory) {
                 pi.applicationInfo.flags |= ApplicationInfo.FLAG_SYSTEM;
+                pi.applicationInfo.flags &= ~ApplicationInfo.FLAG_UPDATED_SYSTEM_APP;
             } else {
                 pi.applicationInfo.flags &= ~ApplicationInfo.FLAG_SYSTEM;
+                pi.applicationInfo.flags |= ApplicationInfo.FLAG_UPDATED_SYSTEM_APP;
             }
             if (apexInfo.isActive) {
                 pi.applicationInfo.flags |= ApplicationInfo.FLAG_INSTALLED;