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

Commit eef10c4f authored by William Loh's avatar William Loh
Browse files

Add package name to historical session 

Bug: 325339620
Test: manual
Change-Id: I226d27742cfd0dfa38e48025cf01ff3760794209
parent 34e20b18

services/core/java/com/android/server/pm/PackageInstallerHistoricalSession.java

+8 −1
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ public final class PackageInstallerHistoricalSession { 
    private final int mSessionErrorCode;

    private final String mSessionErrorMessage;

    private final String mPreVerifiedDomains;

    private final String mPackageName;



    PackageInstallerHistoricalSession(int sessionId, int userId, int originalInstallerUid,

            String originalInstallerPackageName, InstallSource installSource, int installerUid,
@@ -88,7 +89,8 @@ public final class PackageInstallerHistoricalSession { 
            String finalMessage, SessionParams params, int parentSessionId,

            int[] childSessionIds, boolean sessionApplied, boolean sessionFailed,

            boolean sessionReady, int sessionErrorCode, String sessionErrorMessage,

            PreapprovalDetails preapprovalDetails, DomainSet preVerifiedDomains) {

            PreapprovalDetails preapprovalDetails, DomainSet preVerifiedDomains,

            String packageNameFromApk) {

        this.sessionId = sessionId;

        this.userId = userId;

        this.mOriginalInstallerUid = originalInstallerUid;
@@ -135,6 +137,9 @@ public final class PackageInstallerHistoricalSession { 
        } else {

            this.mPreVerifiedDomains = null;

        }



        this.mPackageName = preapprovalDetails != null ? preapprovalDetails.getPackageName()

                : packageNameFromApk != null ? packageNameFromApk : params.appPackageName;

    }



    void dump(IndentingPrintWriter pw) {
@@ -178,6 +183,7 @@ public final class PackageInstallerHistoricalSession { 
        pw.printPair("mSessionErrorMessage", mSessionErrorMessage);

        pw.printPair("mPreapprovalDetails", mPreapprovalDetails);

        pw.printPair("mPreVerifiedDomains", mPreVerifiedDomains);

        pw.printPair("mAppPackageName", mPackageName);

        pw.println();



        pw.decreaseIndent();
@@ -206,6 +212,7 @@ public final class PackageInstallerHistoricalSession { 
        info.createdMillis = mCreatedMillis;

        info.updatedMillis = mUpdatedMillis;

        info.installerUid = mInstallerUid;

        info.appPackageName = mPackageName;

        return info;

    }

}

services/core/java/com/android/server/pm/PackageInstallerSession.java

+1 −1
Original line number Diff line number Diff line
@@ -1242,7 +1242,7 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
                    mStageDirInUse, mDestroyed, mFds.size(), mBridges.size(), mFinalStatus,

                    mFinalMessage, params, mParentSessionId, getChildSessionIdsLocked(),

                    mSessionApplied, mSessionFailed, mSessionReady, mSessionErrorCode,

                    mSessionErrorMessage, mPreapprovalDetails, mPreVerifiedDomains);

                    mSessionErrorMessage, mPreapprovalDetails, mPreVerifiedDomains, mPackageName);

        }

    }