diff options
| author | Ian Rogers <irogers@google.com> | 2014-01-07 21:47:37 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-07 21:47:37 +0000 |
| commit | 6c6a11648fc6ed9bf058fba51d82d467472ed8e6 (patch) | |
| tree | 55f09ee97741e7728a6633f9ca464d350e55d93a | |
| parent | dfc73e9c243092d395913737af622c89ad1830be (diff) | |
| parent | 878df18c48fa5f0282cee5ded80238f64826cf84 (diff) | |
| download | frameworks_base-6c6a11648fc6ed9bf058fba51d82d467472ed8e6.zip frameworks_base-6c6a11648fc6ed9bf058fba51d82d467472ed8e6.tar.gz frameworks_base-6c6a11648fc6ed9bf058fba51d82d467472ed8e6.tar.bz2 | |
am 878df18c: am 8dbfde50: am 0e16e3d7: am c2b50c10: am f11dee79: Merge "Add a call to registerAppInfo for the VMRuntime"
* commit '878df18c48fa5f0282cee5ded80238f64826cf84':
Add a call to registerAppInfo for the VMRuntime
| -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 40899c0..3725cd4 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -100,6 +100,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; @@ -748,6 +750,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; |