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

Author: kruton

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

@@ -7843,7 +7843,7 @@ private boolean getPackageSizeInfoLI(String packageName, PackageStats pStats) {
                 }
                 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 @@ private boolean getPackageSizeInfoLI(String packageName, PackageStats pStats) {
         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;
     }