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

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

Browse Source 
am: db73912471

* commit 'db73912471df39aa527971f2884f37295616d3a9':
  Pass app's code paths to the runtime
This commit is contained in:
Calin Juravle
2015-12-21 09:52:40 +00:00
committed by android-build-merger
parent a87b9287a4 db73912471
commit 7d7ab7ad3b
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/app/ActivityThread.java
View File

@@ -119,6 +119,7 @@ import java.lang.ref.WeakReference;
import java.net.InetAddress; import java.net.InetAddress;
import java.text.DateFormat; import java.text.DateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.Map; import java.util.Map;
@@ -814,8 +815,13 @@ public final class ActivityThread {
// Tell the VMRuntime about the application, unless it is shared // Tell the VMRuntime about the application, unless it is shared
// inside a process. // inside a process.
if (!sharable) { 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, VMRuntime.registerAppInfo(appInfo.packageName, appInfo.dataDir,
appInfo.processName); codePaths.toArray(new String[codePaths.size()]));
} }
} }