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

Commit 44c3a3aa 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:... 

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

Change-Id: I6d02a53b5d03991c3d41da8c300d7c74c194e51c
parents 9544a24b bcfd0170

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.,