commit 1c004e50316f6f3bbb95b75d4826d7ec454be698
author Narayan Kamath <narayan@google.com> Fri Apr 11 08:24:17 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Apr 11 08:24:18 2014 +0000
tree 712345e4815f8e9eda40e8f740f5f4bded582ed2
parent 5c3042953ad3dc1d1fe916faee437e57152aa4aa
parent dfa1611b17ab9ddf604b3c5098ff63acbba04e55

Merge "Fix debugging on dalvik."

vm/native/dalvik_system_ZygoteHooks.cpp

diff --git a/vm/native/dalvik_system_ZygoteHooks.cpp b/vm/native/dalvik_system_ZygoteHooks.cpp
index 0ede69d..717803d 100644
--- a/vm/native/dalvik_system_ZygoteHooks.cpp
+++ b/vm/native/dalvik_system_ZygoteHooks.cpp
@@ -59,8 +59,6 @@
  */
 static void enableDebugFeatures(u4 debugFlags)
 {
-    ALOGV("debugFlags is 0x%02x", debugFlags);
-
     gDvm.jdwpAllowed = ((debugFlags & DEBUG_ENABLE_DEBUGGER) != 0);
 
     if ((debugFlags & DEBUG_ENABLE_CHECKJNI) != 0) {
@@ -145,7 +143,7 @@
     thread->systemTid = dvmGetSysThreadId();
 
     /* configure additional debug options */
-    enableDebugFeatures(args[1]);
+    enableDebugFeatures(args[2]);
 
     gDvm.zygote = false;
     if (!dvmInitAfterZygote()) {