diff options
author | Christopher Tate <ctate@android.com> | 2009-11-06 13:22:54 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-06 13:22:54 -0800 |
commit | 307fbbf2b6dbdbc9249c492d5569e874207de5b1 (patch) | |
tree | 875f27c6d064a296f36fb6030036557eacbb41a9 | |
parent | 883be83eab608237652e013b26fe871c18fa8901 (diff) | |
parent | 49fa9e00986993f5cf05f1092c30479cb98eb254 (diff) | |
download | frameworks_base-307fbbf2b6dbdbc9249c492d5569e874207de5b1.zip frameworks_base-307fbbf2b6dbdbc9249c492d5569e874207de5b1.tar.gz frameworks_base-307fbbf2b6dbdbc9249c492d5569e874207de5b1.tar.bz2 |
am 49fa9e00: Merge change Ibf6e51b7 into eclair
Merge commit '49fa9e00986993f5cf05f1092c30479cb98eb254' into eclair-mr2
* commit '49fa9e00986993f5cf05f1092c30479cb98eb254':
Set argv[0] from the main thread of an app, not a random binder thread
-rw-r--r-- | core/java/android/app/ActivityThread.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index 5f2de0f..daf4090 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -1447,7 +1447,6 @@ public final class ActivityThread { Bundle instrumentationArgs, IInstrumentationWatcher instrumentationWatcher, int debugMode, boolean isRestrictedBackupMode, Configuration config, Map<String, IBinder> services) { - Process.setArgV0(processName); if (services != null) { // Setup the service cache in the ServiceManager @@ -3818,6 +3817,7 @@ public final class ActivityThread { //Process.setUid(data.appInfo.uid); // send up app name; do this *before* waiting for debugger + Process.setArgV0(data.processName); android.ddm.DdmHandleAppName.setAppName(data.processName); /* |