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

Commit 4b4ce6fa authored by Fyodor Kupolov's avatar Fyodor Kupolov
Browse files

Log pm install time and package name 

Bug: 32559349
Test: manual
Change-Id: Ibfbea8cab2ab085109ee4d5a248bfacf82cdfbbb
parent a722a2ea

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

+10 −5
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ import android.os.UserManager; 
import android.text.TextUtils;

import android.text.format.DateUtils;

import android.util.Log;

import android.util.Pair;



import com.android.internal.content.PackageHelper;

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.

     */

    private int runInstall() throws RemoteException {

        long startedTime = SystemClock.elapsedRealtime();

        final InstallParams params = makeInstallParams();

        final String inPath = nextArg();

        if (params.sessionParams.sizeBytes == -1 && !STDIN_PATH.equals(inPath)) {
@@ -435,10 +437,12 @@ public final class Pm { 
                    false /*logSuccess*/) != PackageInstaller.STATUS_SUCCESS) {

                return 1;

            }

            if (doCommitSession(sessionId, false /*logSuccess*/)

                    != PackageInstaller.STATUS_SUCCESS) {

            Pair<String, Integer> status = doCommitSession(sessionId, false /*logSuccess*/);

            if (status.second != PackageInstaller.STATUS_SUCCESS) {

                return 1;

            }

            Log.i(TAG, "Package " + status.first + " installed in " + (SystemClock.elapsedRealtime()

                    - startedTime) + " ms");

            System.out.println("Success");

            return 0;

        } finally {
@@ -456,7 +460,7 @@ public final class Pm { 


    private int runInstallCommit() throws RemoteException {

        final int sessionId = Integer.parseInt(nextArg());

        return doCommitSession(sessionId, true /*logSuccess*/);

        return doCommitSession(sessionId, true /*logSuccess*/).second;

    }



    private int runInstallCreate() throws RemoteException {
@@ -646,7 +650,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;

        try {

            session = new PackageInstaller.Session(
@@ -666,7 +671,7 @@ public final class Pm { 
                System.err.println("Failure ["

                        + result.getStringExtra(PackageInstaller.EXTRA_STATUS_MESSAGE) + "]");

            }

            return status;

            return new Pair<>(result.getStringExtra(PackageInstaller.EXTRA_PACKAGE_NAME), status);

        } finally {

            IoUtils.closeQuietly(session);

        }