Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a5df9aa4 authored by Christopher Tate's avatar Christopher Tate Committed by Android Git Automerger
Browse files

am 3c0cd0b5: am 34718238: am 3e7d0344: Merge "Avoid adding FORWARD_LOCK flag... 

am 3c0cd0b5: am 34718238: am 3e7d0344: Merge "Avoid adding FORWARD_LOCK flag to an updated system app"

* commit '3c0cd0b5':
  Avoid adding FORWARD_LOCK flag to an updated system app
parents 4d7dc1a2 3c0cd0b5

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

100644 → 100755
+6 −3
Original line number Diff line number Diff line
@@ -3554,11 +3554,14 @@ public class PackageManagerService extends IPackageManager.Stub { 
        }



        // 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 ((parseFlags & PackageParser.PARSE_IS_SYSTEM_DIR) == 0) {

            if (ps != null && !ps.codePath.equals(ps.resourcePath)) {

                parseFlags |= PackageParser.PARSE_FORWARD_LOCK;

            }

        }



        String codePath = null;

        String resPath = null;