commit aa9b7407da356df7cfc193dd12b2c65b720d199d
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Mar 25 16:27:52 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 25 16:27:52 2020 +0000
tree 774d5a5e28c9fbe6db40eb19242a5a1cdce2e258
parent 97b931681f4f123a5d2328a8e39a9ef65a5f9560
parent 465c5fb2a308348b5f962b41275f69b18241a6c5

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

core/java/android/app/LoadedApk.java

diff --git a/core/java/android/app/LoadedApk.java b/core/java/android/app/LoadedApk.java
index d650801..10f7835 100644
--- a/core/java/android/app/LoadedApk.java
+++ b/core/java/android/app/LoadedApk.java
@@ -801,6 +801,11 @@
         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.,