diff options
| author | Ian Rogers <irogers@google.com> | 2014-01-07 21:45:07 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-07 21:45:07 +0000 |
| commit | 878df18c48fa5f0282cee5ded80238f64826cf84 (patch) | |
| tree | bdcec9599a2f758a476ae461fedccb0bc5b31871 /core | |
| parent | 66e9b1e1178813037daf3798b8fe23467c4b91ab (diff) | |
| parent | 8dbfde504787a002de1074a5dfac7eea9d060a43 (diff) | |
| download | frameworks_base-878df18c48fa5f0282cee5ded80238f64826cf84.zip frameworks_base-878df18c48fa5f0282cee5ded80238f64826cf84.tar.gz frameworks_base-878df18c48fa5f0282cee5ded80238f64826cf84.tar.bz2 | |
am 8dbfde50: am 0e16e3d7: am c2b50c10: am f11dee79: Merge "Add a call to registerAppInfo for the VMRuntime"
* commit '8dbfde504787a002de1074a5dfac7eea9d060a43':
Add a call to registerAppInfo for the VMRuntime
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/app/ActivityThread.java | 5 |
1 files changed, 5 insertions, 0 deletions
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.internal.util.FastPrintWriter; 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 @@ public final class ActivityThread { setCoreSettings(coreSettings); + // Tell the VMRuntime about the application. + VMRuntime.registerAppInfo(appInfo.dataDir, appInfo.processName); + AppBindData data = new AppBindData(); data.processName = processName; data.appInfo = appInfo; |