commit 0e16e3d7ddcca8fe68bc747b88159eeb6b161785
author Ian Rogers <irogers@google.com> Tue Jan 07 13:38:44 2014 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Jan 07 13:38:44 2014 -0800
tree e7c9cc302a9f1e3ee644460b58232881cc01b1f3
parent 3bbf7e6aa5a9eda1cc4b1c57da832ebee3bb5dd8
parent c2b50c10f0bf636562deba1d92ec7b54b13909de

am c2b50c10: am f11dee79: Merge "Add a call to registerAppInfo for the VMRuntime"

* commit 'c2b50c10f0bf636562deba1d92ec7b54b13909de':
  Add a call to registerAppInfo for the VMRuntime

core/java/android/app/ActivityThread.java

diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java
index d849965..97baf9a 100644
--- a/core/java/android/app/ActivityThread.java
+++ b/core/java/android/app/ActivityThread.java
@@ -96,6 +96,8 @@
 import com.android.org.conscrypt.OpenSSLSocketImpl;
 import com.google.android.collect.Lists;
 
+import dalvik.system.VMRuntime;
+
 import java.io.File;
 import java.io.FileDescriptor;
 import java.io.FileOutputStream;
@@ -740,6 +742,9 @@
 
             setCoreSettings(coreSettings);
 
+            // Tell the VMRuntime about the application.
+            VMRuntime.registerAppInfo(appInfo.dataDir, appInfo.processName);
+
             AppBindData data = new AppBindData();
             data.processName = processName;
             data.appInfo = appInfo;