Merge "Pass app's data dir to ART" am: 16749ac83e

am: 33ed677361

Change-Id: I9a7c617f13dadc91b735837d1778e3d526be8520

core/java/android/app/ActivityThread.java

@@ -5694,6 +5694,10 @@ public final class ActivityThread extends ClientTransactionHandler {
                                                 UserHandle.myUserId());
         VMRuntime.setProcessPackageName(data.appInfo.packageName);
 
+        // Pass data directory path to ART. This is used for caching information and
+        // should be set before any application code is loaded.
+        VMRuntime.setProcessDataDirectory(data.appInfo.dataDir);
+
         if (mProfiler.profileFd != null) {
             mProfiler.startProfiling();
         }