Merge "[DO NOT MERGE] Only setSize if -s arg is specified" into nyc-mr1-dev (e97969b4) · Commits · e / os / android_frameworks_base

cmds/pm/src/com/android/commands/pm/Pm.java

+15 −9

Original line number	Diff line number	Diff line
		@@ -367,9 +367,12 @@ public final class Pm {
		private int runInstall() throws RemoteException {
		final InstallParams params = makeInstallParams();
		final String inPath = nextArg();
		boolean installExternal =
		(params.sessionParams.installFlags & PackageManager.INSTALL_EXTERNAL) != 0;
		if (params.sessionParams.sizeBytes < 0 && inPath != null) {
		File file = new File(inPath);
		if (file.isFile()) {
		if (installExternal) {
		try {
		ApkLite baseApk = PackageParser.parseApkLite(file, 0);
		PackageLite pkgLite = new PackageLite(null, baseApk, null, null, null);
		@@ -380,6 +383,9 @@ public final class Pm {
		System.err.println("Error: Failed to parse APK file : " + e);
		return 1;
		}
		} else {
		params.sessionParams.setSize(file.length());
		}
		}
		}

+15 −8

Original line number	Diff line number	Diff line
		@@ -143,18 +143,25 @@ class PackageManagerShellCommand extends ShellCommand {
		final PrintWriter pw = getOutPrintWriter();
		final InstallParams params = makeInstallParams();
		final String inPath = getNextArg();
		boolean installExternal =
		(params.sessionParams.installFlags & PackageManager.INSTALL_EXTERNAL) != 0;
		if (params.sessionParams.sizeBytes < 0 && inPath != null) {
		File file = new File(inPath);
		if (file.isFile()) {
		if (installExternal) {
		try {
		ApkLite baseApk = PackageParser.parseApkLite(file, 0);
		PackageLite pkgLite = new PackageLite(null, baseApk, null, null, null);
		params.sessionParams.setSize(
		PackageHelper.calculateInstalledSize(pkgLite,false, params.sessionParams.abiOverride));
		PackageHelper.calculateInstalledSize(pkgLite, false,
		params.sessionParams.abiOverride));
		} catch (PackageParserException \| IOException e) {
		pw.println("Error: Failed to parse APK file : " + e);
		return 1;
		}
		} else {
		params.sessionParams.setSize(file.length());
		}
		}
		}