summaryrefslogtreecommitdiffstats
path: root/vm/Thread.cpp
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2013-06-05 13:23:28 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-06-05 13:23:28 -0700
commitb91f922c80b454fa579deaee262bdd51225b82ee (patch)
treeb03d52402d67163cd4680d29768847a8a14ce2f0 /vm/Thread.cpp
parent8c44176ceda51ac586346a64a5ce3af2c0e66624 (diff)
parentf3079bdadf30d93b37e0a59a8787c636027a36f5 (diff)
downloadandroid_dalvik-b91f922c80b454fa579deaee262bdd51225b82ee.tar.gz
android_dalvik-b91f922c80b454fa579deaee262bdd51225b82ee.tar.bz2
android_dalvik-b91f922c80b454fa579deaee262bdd51225b82ee.zip
am f3079bda: Merge "Rename unreasonable function name dmvCompilerTemplateEnd"
* commit 'f3079bdadf30d93b37e0a59a8787c636027a36f5': Rename unreasonable function name dmvCompilerTemplateEnd
Diffstat (limited to 'vm/Thread.cpp')
-rw-r--r--vm/Thread.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/vm/Thread.cpp b/vm/Thread.cpp
index 9671b84c7..05fbd1143 100644
--- a/vm/Thread.cpp
+++ b/vm/Thread.cpp
@@ -3598,7 +3598,7 @@ void dvmNukeThread(Thread* thread)
ALOGD("Sent, pausing to let debuggerd run");
usleep(8 * 1000 * 1000); // TODO: timed-wait until debuggerd finishes
- /* ignore SIGSEGV so the eventual dmvAbort() doesn't notify debuggerd */
+ /* ignore SIGSEGV so the eventual dvmAbort() doesn't notify debuggerd */
signal(SIGSEGV, SIG_IGN);
ALOGD("Continuing");
}