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

Commit f7f22f25 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." am: 13033a26 

Change-Id: If910e9efbb5cb4cfbee80ed6b86358a549d21975
parents 10a1a57c 13033a26

core/java/android/app/LoadedApk.java

+5 −0
Original line number Diff line number Diff line
@@ -797,6 +797,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.,