Commits

Christopher Tate  committed 3e7d034 Merge

Merge "Avoid adding FORWARD_LOCK flag to an updated system app"

  • Participants
  • Parent commits 4be48d4, 2d91007

Comments (0)

Files changed (1)

File services/java/com/android/server/pm/PackageManagerService.java

         }
 
         // The apk is forward locked (not public) if its code and resources
-        // are kept in different files.
+        // are kept in different files. (except for app in either system or
+        // vendor path).
         // TODO grab this value from PackageSettings
-        if (ps != null && !ps.codePath.equals(ps.resourcePath)) {
-            parseFlags |= PackageParser.PARSE_FORWARD_LOCK;
+        if ((parseFlags & PackageParser.PARSE_IS_SYSTEM_DIR) == 0) {
+            if (ps != null && !ps.codePath.equals(ps.resourcePath)) {
+                parseFlags |= PackageParser.PARSE_FORWARD_LOCK;
+            }
         }
 
         String codePath = null;