Merge "Don't include the data dir in zygote library paths." am: 13033a2612

Change-Id: If910e9efbb5cb4cfbee80ed6b86358a549d21975

core/java/android/app/LoadedApk.java

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