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

Commit 35bbfae5 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Don't include the data dir in zygote library paths." into rvc-dev am: aa9b7407 

Change-Id: I60d203a26ea175db12845a710c75caae65aa90e8
parents 7570fa1f aa9b7407

core/java/android/app/LoadedApk.java

+5 −0
Original line number Diff line number Diff line
@@ -801,6 +801,11 @@ public final class LoadedApk { 
        makePaths(mActivityThread, isBundledApp, mApplicationInfo, zipPaths, libPaths);



        String libraryPermittedPath = mDataDir;

        if (mActivityThread == null) {

            // In a zygote context where mActivityThread is null we can't access the app data dir

            // and including this in libraryPermittedPath would cause SELinux denials.

            libraryPermittedPath = "";

        }



        if (isBundledApp) {

            // For bundled apps, add the base directory of the app (e.g.,