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

Commit a0b63e2b authored by Songchun Fan's avatar Songchun Fan Committed by Android Build Coastguard Worker
Browse files

Revert "[ADI][21/N] fix NPE when stageDir is null" 

FLAG: EXEMPT just revert
BUG: 422535876
Test: n/a just revert

This reverts commit 6d947479.
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:3f8c54efea23b7b347e5eb024ab6d75de44776d5)
Merged-In: If4916ffb8ef2616761f9d575828276d110491fe2
Change-Id: If4916ffb8ef2616761f9d575828276d110491fe2
parent 65eb6cf0

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

+2 −4
Original line number Original line Diff line number Diff line
@@ -3028,8 +3028,7 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
            // the installation can proceed.

            // the installation can proceed.

            final VerifierCallback verifierCallback = new VerifierCallback();

            final VerifierCallback verifierCallback = new VerifierCallback();

            if (!mVerifierController.startVerificationSession(mPm::snapshotComputer, userId,

            if (!mVerifierController.startVerificationSession(mPm::snapshotComputer, userId,

                    sessionId, getPackageName(),

                    sessionId, getPackageName(), Uri.fromFile(stageDir), signingInfo,

                    stageDir == null ? Uri.EMPTY : Uri.fromFile(stageDir), signingInfo,

                    declaredLibraries, mCurrentVerificationPolicy.get(),

                    declaredLibraries, mCurrentVerificationPolicy.get(),

                    /* extensionParams= */ params.extensionParams,

                    /* extensionParams= */ params.extensionParams,

                    verifierCallback, /* retry= */ false)) {

                    verifierCallback, /* retry= */ false)) {
@@ -3080,8 +3079,7 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
        // the installation can proceed.

        // the installation can proceed.

        final VerifierCallback verifierCallback = new VerifierCallback();

        final VerifierCallback verifierCallback = new VerifierCallback();

        if (!mVerifierController.startVerificationSession(snapshotSupplier, userId,

        if (!mVerifierController.startVerificationSession(snapshotSupplier, userId,

                sessionId, getPackageName(),

                sessionId, getPackageName(), Uri.fromFile(stageDir), signingInfo,

                stageDir == null ? Uri.EMPTY : Uri.fromFile(stageDir), signingInfo,

                declaredLibraries, mCurrentVerificationPolicy.get(), /* extensionParams= */ null,

                declaredLibraries, mCurrentVerificationPolicy.get(), /* extensionParams= */ null,

                verifierCallback, retry)) {

                verifierCallback, retry)) {

            // A verifier is installed but cannot be connected.

            // A verifier is installed but cannot be connected.