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

Change-Id: I8fb4d7f609173edb436175338f26bc79d6fa834e
This commit is contained in:
TreeHugger Robot
2020-03-25 16:37:20 +00:00
committed by Automerger Merge Worker

View File

@@ -801,6 +801,11 @@ public final class LoadedApk {
makePaths(mActivityThread, isBundledApp, mApplicationInfo, zipPaths, libPaths); makePaths(mActivityThread, isBundledApp, mApplicationInfo, zipPaths, libPaths);
String libraryPermittedPath = mDataDir; 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) { if (isBundledApp) {
// For bundled apps, add the base directory of the app (e.g., // For bundled apps, add the base directory of the app (e.g.,