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

Commit 6dd3a0d6 authored by Kenny Root's avatar Kenny Root Committed by Android Git Automerger
Browse files

am 87353093: Merge "Measure ASECs for forward-locked apps" into jb-dev 

* commit '87353093':
  Measure ASECs for forward-locked apps
parents 13b9d282 87353093

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

+8 −1
Original line number Diff line number Diff line
@@ -7843,7 +7843,7 @@ public class PackageManagerService extends IPackageManager.Stub { 
                }

                p = ps.pkg;

            }

            if (p != null && isExternal(p)) {

            if (p != null && (isExternal(p) || isForwardLocked(p))) {

                String secureContainerId = cidFromCodePath(p.applicationInfo.sourceDir);

                if (secureContainerId != null) {

                    asecPath = PackageHelper.getSdFilesystem(secureContainerId);
@@ -7866,6 +7866,13 @@ public class PackageManagerService extends IPackageManager.Stub { 
        if (res < 0) {

            return false;

        }



        // Fix-up for forward-locked applications in ASEC containers.

        if (!isExternal(p)) {

            pStats.codeSize += pStats.externalCodeSize;

            pStats.externalCodeSize = 0L;

        }



        return true;

    }