diff options
| author | Andy McFadden <fadden@android.com> | 2009-10-13 16:19:22 -0700 |
|---|---|---|
| committer | Andy McFadden <fadden@android.com> | 2009-10-13 16:27:51 -0700 |
| commit | 9ef546e0cad0b2cb22a522b7f3dde1994770d9ca (patch) | |
| tree | dedfcf66013f8df35693ef0554fccadcbcff7d76 /vm/jdwp | |
| parent | 6ff3c8fde9623dadad726dbd5e1658585c321751 (diff) | |
| download | android_dalvik-9ef546e0cad0b2cb22a522b7f3dde1994770d9ca.tar.gz android_dalvik-9ef546e0cad0b2cb22a522b7f3dde1994770d9ca.tar.bz2 android_dalvik-9ef546e0cad0b2cb22a522b7f3dde1994770d9ca.zip | |
Bump "public" version from 1.1.0 to 1.2.0.
Also, send correct version in JDWP VirtualMachine.Version packet.
Diffstat (limited to 'vm/jdwp')
| -rw-r--r-- | vm/jdwp/JdwpHandler.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/vm/jdwp/JdwpHandler.c b/vm/jdwp/JdwpHandler.c index 1163fde3b..53b5d260a 100644 --- a/vm/jdwp/JdwpHandler.c +++ b/vm/jdwp/JdwpHandler.c @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /* * Handle messages from debugger. * @@ -31,6 +32,7 @@ #include "Bits.h" #include "Atomic.h" +#include "DalvikVersion.h" #include <stdlib.h> #include <string.h> @@ -209,8 +211,12 @@ bail: static JdwpError handleVM_Version(JdwpState* state, const u1* buf, int dataLen, ExpandBuf* pReply) { + char tmpBuf[128]; + /* text information on VM version */ - expandBufAddUtf8String(pReply, (const u1*) "Android DalvikVM 1.0.1"); + sprintf(tmpBuf, "Android DalvikVM %d.%d.%d", + DALVIK_MAJOR_VERSION, DALVIK_MINOR_VERSION, DALVIK_BUG_VERSION); + expandBufAddUtf8String(pReply, (const u1*) tmpBuf); /* JDWP version numbers */ expandBufAdd4BE(pReply, 1); // major expandBufAdd4BE(pReply, 5); // minor |