Merge "Change default dalvik.vm.jdwp-provider to adbconnection"
diff --git a/cmdline/cmdline_parser_test.cc b/cmdline/cmdline_parser_test.cc
index 5d67206..70cc07e 100644
--- a/cmdline/cmdline_parser_test.cc
+++ b/cmdline/cmdline_parser_test.cc
@@ -375,7 +375,7 @@
 
 TEST_F(CmdlineParserTest, TestJdwpProviderDefault) {
   const char* opt_args = "-XjdwpProvider:default";
-  EXPECT_SINGLE_PARSE_VALUE(JdwpProvider::kInternal, opt_args, M::JdwpProvider);
+  EXPECT_SINGLE_PARSE_VALUE(JdwpProvider::kAdbConnection, opt_args, M::JdwpProvider);
 }  // TEST_F
 
 TEST_F(CmdlineParserTest, TestJdwpProviderInternal) {
diff --git a/cmdline/cmdline_types.h b/cmdline/cmdline_types.h
index d0d6bfd..2bc7409 100644
--- a/cmdline/cmdline_types.h
+++ b/cmdline/cmdline_types.h
@@ -77,10 +77,10 @@
           "Example: -XjdwpProvider:internal for internal jdwp implementation\n"
           "Example: -XjdwpProvider:adbconnection for adb connection mediated jdwp implementation\n"
           "Example: -XjdwpProvider:default for the default jdwp implementation"
-          " (currently internal)\n");
-    } else if (option == "internal" || option == "default") {
+          " (currently adbconnection)\n");
+    } else if (option == "internal") {
       return Result::Success(JdwpProvider::kInternal);
-    } else if (option == "adbconnection") {
+    } else if (option == "adbconnection" || option == "default") {
       return Result::Success(JdwpProvider::kAdbConnection);
     } else if (option == "none") {
       return Result::Success(JdwpProvider::kNone);