commit 14dd5a82ad85a28612bf86e755ff929d767cea4c
author Jeff Hao <jeffhao@google.com> Thu Apr 11 10:23:36 2013 -0700
committer Jeff Hao <jeffhao@google.com> Thu Apr 11 11:22:36 2013 -0700
tree 59643b02b8931887e6b00589e41af137ee13a149
parent 4b4d711852982716ac478288f210bb2a2f504589

Fix exception caught listeners and frame type for deopt.

Change-Id: I5792ebe9a7772d068b6ec556b4fc27ddd44d7ca1

src/debugger.cc

diff --git a/src/debugger.cc b/src/debugger.cc
index 9bd1eb5..0712c93 100644
--- a/src/debugger.cc
+++ b/src/debugger.cc
@@ -538,7 +538,8 @@
   runtime->GetInstrumentation()->AddListener(&gDebugInstrumentationListener,
                                              instrumentation::Instrumentation::kMethodEntered |
                                              instrumentation::Instrumentation::kMethodExited |
-                                             instrumentation::Instrumentation::kDexPcMoved);
+                                             instrumentation::Instrumentation::kDexPcMoved |
+                                             instrumentation::Instrumentation::kExceptionCaught);
   gDebuggerActive = true;
   CHECK_EQ(self->SetStateUnsafe(old_state), kRunnable);
   runtime->GetThreadList()->ResumeAll();
@@ -561,7 +562,8 @@
   runtime->GetInstrumentation()->RemoveListener(&gDebugInstrumentationListener,
                                                 instrumentation::Instrumentation::kMethodEntered |
                                                 instrumentation::Instrumentation::kMethodExited |
-                                                instrumentation::Instrumentation::kDexPcMoved);
+                                                instrumentation::Instrumentation::kDexPcMoved |
+                                                instrumentation::Instrumentation::kExceptionCaught);
   gDebuggerActive = false;
   gRegistry->Clear();
   gDebuggerConnected = false;