Merge "Log pm install time and package name" (ed4cd7a1) · Commits · e / os / android_frameworks_base

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

+10 −5

Original line number	Original line	Diff line number	Diff line
	@@ -65,6 +65,7 @@ import android.os.UserManager;
	import android.text.TextUtils;		import android.text.TextUtils;
	import android.text.format.DateUtils;		import android.text.format.DateUtils;
	import android.util.Log;		import android.util.Log;
			import android.util.Pair;

	import com.android.internal.content.PackageHelper;		import com.android.internal.content.PackageHelper;
	import com.android.internal.util.ArrayUtils;		import com.android.internal.util.ArrayUtils;
	@@ -402,6 +403,7 @@ public final class Pm {
	* The use of "adb install" or "cmd package install" over "pm install" is highly encouraged.		* The use of "adb install" or "cmd package install" over "pm install" is highly encouraged.
	*/		*/
	private int runInstall() throws RemoteException {		private int runInstall() throws RemoteException {
			long startedTime = SystemClock.elapsedRealtime();
	final InstallParams params = makeInstallParams();		final InstallParams params = makeInstallParams();
	final String inPath = nextArg();		final String inPath = nextArg();
	if (params.sessionParams.sizeBytes == -1 && !STDIN_PATH.equals(inPath)) {		if (params.sessionParams.sizeBytes == -1 && !STDIN_PATH.equals(inPath)) {
	@@ -435,10 +437,12 @@ public final class Pm {
	false /logSuccess/) != PackageInstaller.STATUS_SUCCESS) {		false /logSuccess/) != PackageInstaller.STATUS_SUCCESS) {
	return 1;		return 1;
	}		}
	if (doCommitSession(sessionId, false /logSuccess/)		Pair<String, Integer> status = doCommitSession(sessionId, false /logSuccess/);
	!= PackageInstaller.STATUS_SUCCESS) {		if (status.second != PackageInstaller.STATUS_SUCCESS) {
	return 1;		return 1;
	}		}
			Log.i(TAG, "Package " + status.first + " installed in " + (SystemClock.elapsedRealtime()
			- startedTime) + " ms");
	System.out.println("Success");		System.out.println("Success");
	return 0;		return 0;
	} finally {		} finally {
	@@ -456,7 +460,7 @@ public final class Pm {

	private int runInstallCommit() throws RemoteException {		private int runInstallCommit() throws RemoteException {
	final int sessionId = Integer.parseInt(nextArg());		final int sessionId = Integer.parseInt(nextArg());
	return doCommitSession(sessionId, true /logSuccess/);		return doCommitSession(sessionId, true /logSuccess/).second;
	}		}

	private int runInstallCreate() throws RemoteException {		private int runInstallCreate() throws RemoteException {
	@@ -650,7 +654,8 @@ public final class Pm {
	}		}
	}		}

	private int doCommitSession(int sessionId, boolean logSuccess) throws RemoteException {		private Pair<String, Integer> doCommitSession(int sessionId, boolean logSuccess)
			throws RemoteException {
	PackageInstaller.Session session = null;		PackageInstaller.Session session = null;
	try {		try {
	session = new PackageInstaller.Session(		session = new PackageInstaller.Session(
	@@ -670,7 +675,7 @@ public final class Pm {
	System.err.println("Failure ["		System.err.println("Failure ["
	+ result.getStringExtra(PackageInstaller.EXTRA_STATUS_MESSAGE) + "]");		+ result.getStringExtra(PackageInstaller.EXTRA_STATUS_MESSAGE) + "]");
	}		}
	return status;		return new Pair<>(result.getStringExtra(PackageInstaller.EXTRA_PACKAGE_NAME), status);
	} finally {		} finally {
	IoUtils.closeQuietly(session);		IoUtils.closeQuietly(session);
	}		}