Merge "Pass app\'s code paths to the runtime" am: db73912471

am: 7d7ab7ad3b

* commit '7d7ab7ad3b096d28b274024705b3171e42bebdcd':
  Pass app's code paths to the runtime

1 files changed, 7 insertions, 1 deletions

diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java
index 3962abde0f91..ed168d1674ac 100644
--- a/core/java/android/app/ActivityThread.java
+++ b/core/java/android/app/ActivityThread.java
@@ -123,6 +123,7 @@ import java.lang.ref.WeakReference;
 import java.net.InetAddress;
 import java.text.DateFormat;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -851,8 +852,13 @@ public final class ActivityThread {
                 // Tell the VMRuntime about the application, unless it is shared
                 // inside a process.
                 if (!sharable) {
+                    final List<String> codePaths = new ArrayList<>();
+                    codePaths.add(appInfo.sourceDir);
+                    if (appInfo.splitSourceDirs != null) {
+                        Collections.addAll(codePaths, appInfo.splitSourceDirs);
+                    }
                     VMRuntime.registerAppInfo(appInfo.packageName, appInfo.dataDir,
-                                            appInfo.processName);
+                            codePaths.toArray(new String[codePaths.size()]));
                 }
             }