commit ccf4c9d99fcffbc9bf65066004896745b9dcc340
author Andy McFadden <fadden@android.com> Fri Nov 04 15:58:37 2011 -0700
committer Andy McFadden <fadden@android.com> Fri Nov 04 15:59:43 2011 -0700
tree 95b14ca2ae75bed8787d84647d1231543d1ee968
parent ab97cd1634ed4e2c9e5c558a9f88ed9ca8623c8c

Don't decr profiling count without incr

The failure cleanup code in dvmMethodTraceStart() was assuming
that profiling had already been started, which was true until my
previous change.  The code in the interpreter isn't too picky, but
updateActiveProfilers() is trying to keep an accurate acount, and
gets upset.  If you pass in a bad filename, we disable something that
was never enabled, and the VM gets confused and aborts out of spite.

Related to bug 5564440

Change-Id: I17fd8bf4654c29f49efb10142d222a91c190b6ed

vm/Profile.cpp

diff --git a/vm/Profile.cpp b/vm/Profile.cpp
index c21d1b8..e1dfc43 100644
--- a/vm/Profile.cpp
+++ b/vm/Profile.cpp
@@ -459,7 +459,6 @@
     return;
 
 fail:
-    updateActiveProfilers(kSubModeMethodTrace, false);
     if (state->traceFile != NULL) {
         fclose(state->traceFile);
         state->traceFile = NULL;