Merge "Close DirectoryStream in ActivityThread after use." (f7da9fd0) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityThread.java

+13 −10

Original line number	Diff line number	Diff line
		@@ -238,6 +238,7 @@ import java.io.PrintWriter;
		import java.lang.ref.WeakReference;
		import java.lang.reflect.Method;
		import java.net.InetAddress;
		import java.nio.file.DirectoryStream;
		import java.nio.file.Files;
		import java.nio.file.Path;
		import java.nio.file.StandardCopyOption;
		@@ -4221,13 +4222,14 @@ public final class ActivityThread extends ClientTransactionHandler

		static void handleAttachStartupAgents(String dataDir) {
		try {
		Path code_cache = ContextImpl.getCodeCacheDirBeforeBind(new File(dataDir)).toPath();
		if (!Files.exists(code_cache)) {
		Path codeCache = ContextImpl.getCodeCacheDirBeforeBind(new File(dataDir)).toPath();
		if (!Files.exists(codeCache)) {
		return;
		}
		Path startup_path = code_cache.resolve("startup_agents");
		if (Files.exists(startup_path)) {
		for (Path p : Files.newDirectoryStream(startup_path)) {
		Path startupPath = codeCache.resolve("startup_agents");
		if (Files.exists(startupPath)) {
		try (DirectoryStream<Path> startupFiles = Files.newDirectoryStream(startupPath)) {
		for (Path p : startupFiles) {
		handleAttachAgent(
		p.toAbsolutePath().toString()
		+ "="
		@@ -4235,6 +4237,7 @@ public final class ActivityThread extends ClientTransactionHandler
		null);
		}
		}
		}
		} catch (Exception e) {
		// Ignored.
		}