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

Commit 8a5b5e15 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Close DirectoryStream in ActivityThread after use." am: f7da9fd0 am:... 

Merge "Close DirectoryStream in ActivityThread after use." am: f7da9fd0 am: 6fe40cf6 am: c6de1881 am: 3f88c155

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2509995



Change-Id: I15fe8e87b6071961d4b335bacd1ed680a8a8231b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3f97b3cd 3f88c155

core/java/android/app/ActivityThread.java

+13 −10
Original line number Diff line number Diff line
@@ -240,6 +240,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;
@@ -4352,13 +4353,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()

                                        + "="
@@ -4366,6 +4368,7 @@ public final class ActivityThread extends ClientTransactionHandler 
                                null);

                    }

                }

            }

        } catch (Exception e) {

            // Ignored.

        }