Merge "[incfs] Skip empty folders for app updates" into rvc-dev (26f65631) · Commits · e / os / android_frameworks_base

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

+22 −10

Original line number	Diff line number	Diff line
		@@ -150,7 +150,6 @@ import java.io.FileOutputStream;
		import java.io.IOException;
		import java.util.ArrayList;
		import java.util.Arrays;
		import java.util.LinkedList;
		import java.util.List;
		import java.util.Objects;
		import java.util.Set;
		@@ -2099,11 +2098,13 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub {
		continue;
		}

		mResolvedInstructionSets.add(archSubDir.getName());
		List<File> oatFiles = Arrays.asList(archSubDir.listFiles());
		if (!oatFiles.isEmpty()) {
		mResolvedInheritedFiles.addAll(oatFiles);
		File[] files = archSubDir.listFiles();
		if (files == null \|\| files.length == 0) {
		continue;
		}

		mResolvedInstructionSets.add(archSubDir.getName());
		mResolvedInheritedFiles.addAll(Arrays.asList(files));
		}
		}
		}
		@@ -2117,7 +2118,8 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub {
		if (!libDir.exists() \|\| !libDir.isDirectory()) {
		continue;
		}
		final List<File> libDirsToInherit = new LinkedList<>();
		final List<String> libDirsToInherit = new ArrayList<>();
		final List<File> libFilesToInherit = new ArrayList<>();
		for (File archSubDir : libDir.listFiles()) {
		if (!archSubDir.isDirectory()) {
		continue;
		@@ -2129,14 +2131,24 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub {
		Slog.e(TAG, "Skipping linking of native library directory!", e);
		// shouldn't be possible, but let's avoid inheriting these to be safe
		libDirsToInherit.clear();
		libFilesToInherit.clear();
		break;
		}
		if (!mResolvedNativeLibPaths.contains(relLibPath)) {
		mResolvedNativeLibPaths.add(relLibPath);

		File[] files = archSubDir.listFiles();
		if (files == null \|\| files.length == 0) {
		continue;
		}

		libDirsToInherit.add(relLibPath);
		libFilesToInherit.addAll(Arrays.asList(files));
		}
		for (String subDir : libDirsToInherit) {
		if (!mResolvedNativeLibPaths.contains(subDir)) {
		mResolvedNativeLibPaths.add(subDir);
		}
		libDirsToInherit.addAll(Arrays.asList(archSubDir.listFiles()));
		}
		mResolvedInheritedFiles.addAll(libDirsToInherit);
		mResolvedInheritedFiles.addAll(libFilesToInherit);
		}
		}
		}