am 87353093: Merge "Measure ASECs for forward-locked apps" into jb-dev (6dd3a0d6) · Commits · e / os / android_frameworks_base

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

+8 −1

Original line number	Original line	Diff line number	Diff line
	@@ -7843,7 +7843,7 @@ public class PackageManagerService extends IPackageManager.Stub {
	}		}
	p = ps.pkg;		p = ps.pkg;
	}		}
	if (p != null && isExternal(p)) {		if (p != null && (isExternal(p) \|\| isForwardLocked(p))) {
	String secureContainerId = cidFromCodePath(p.applicationInfo.sourceDir);		String secureContainerId = cidFromCodePath(p.applicationInfo.sourceDir);
	if (secureContainerId != null) {		if (secureContainerId != null) {
	asecPath = PackageHelper.getSdFilesystem(secureContainerId);		asecPath = PackageHelper.getSdFilesystem(secureContainerId);
	@@ -7866,6 +7866,13 @@ public class PackageManagerService extends IPackageManager.Stub {
	if (res < 0) {		if (res < 0) {
	return false;		return false;
	}		}

			// Fix-up for forward-locked applications in ASEC containers.
			if (!isExternal(p)) {
			pStats.codeSize += pStats.externalCodeSize;
			pStats.externalCodeSize = 0L;
			}

	return true;		return true;
	}		}