Merge "resolve stage dir before validation" into oc-mr1-dev (1e285597) · Commits · e / os / android_frameworks_base

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

+7 −7

Original line number	Diff line number	Diff line
		@@ -807,13 +807,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);
		@@ -934,6 +927,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)) {