diff options
| author | 2023-03-28 14:59:06 +0000 | |
|---|---|---|
| committer | 2023-03-28 14:59:06 +0000 | |
| commit | 6fe40cf6d6a8d412a42142262ca56ffc784703a9 (patch) | |
| tree | 209310a1b82d9bdd884ba290082ff051e79a8ef5 | |
| parent | a8b2210b2976288d710606f5fa06d0bc9ccd025f (diff) | |
| parent | f7da9fd0263ed669d7ee750063d0a7f0c48c2ffc (diff) | |
Merge "Close DirectoryStream in ActivityThread after use." am: f7da9fd026
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2509995
Change-Id: I6cfd1cc04d680e22fa65994df4165f36392e30e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/java/android/app/ActivityThread.java | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index 559989368a9f..5ba7a4cb4f54 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -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,18 +4222,20 @@ 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)) { - handleAttachAgent( - p.toAbsolutePath().toString() - + "=" - + dataDir, - null); + 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() + + "=" + + dataDir, + null); + } } } } catch (Exception e) { |