Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: I6d02a53b5d03991c3d41da8c300d7c74c194e51c
This commit is contained in:
TreeHugger Robot
2020-03-25 17:16:52 +00:00
committed by Automerger Merge Worker
parent 9544a24b6a bcfd0170f1
commit 44c3a3aada
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/app/LoadedApk.java
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.,