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

Commit 19d18524 authored by Todd Kennedy's avatar Todd Kennedy Committed by android-build-merger
Browse files

Merge "resolve stage dir before validation" into oc-mr1-dev am: 40f9beb5 

am: 1e285597

Change-Id: Icd3b0a097b2e603f02b7104942c83e013a119877
parents 727dccb9 1e285597

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

+7 −7
Original line number Diff line number Diff line
@@ -813,13 +813,6 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
            throw new PackageManagerException(INSTALL_FAILED_INTERNAL_ERROR, "Session not sealed");

        }



        try {

            resolveStageDirLocked();

        } catch (IOException e) {

            throw new PackageManagerException(INSTALL_FAILED_CONTAINER_ERROR,

                    "Failed to resolve stage location", e);

        }



        Preconditions.checkNotNull(mPackageName);

        Preconditions.checkNotNull(mSignatures);

        Preconditions.checkNotNull(mResolvedBaseFile);
@@ -940,6 +933,13 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
        mResolvedStagedFiles.clear();

        mResolvedInheritedFiles.clear();



        try {

            resolveStageDirLocked();

        } catch (IOException e) {

            throw new PackageManagerException(INSTALL_FAILED_CONTAINER_ERROR,

                    "Failed to resolve stage location", e);

        }



        final File[] removedFiles = mResolvedStageDir.listFiles(sRemovedFilter);

        final List<String> removeSplitList = new ArrayList<>();

        if (!ArrayUtils.isEmpty(removedFiles)) {