Change default dalvik.vm.jdwp-provider to adbconnection

This changes the default jdwp implementation to be libjdwp with the
connection mediated by libadbconnection.

Test: ./test.py --host -j50
Test: ./art/tools/run-libjdwp-tests.sh --mode=device
Test: Build and run
Test: use ddms monitor.
Test: Use Android Studio.
Test: Build and debug debuggable app (bandhook-kotlin)
Test: Build and debug non-debuggable app on userdebug build
      (bandhook-kotlin)
Test: Debug running system process on userdebug build
      (com.android.packageinstaller)
Test: adb shell stop &&
      adb shell setprop dalvik.vm.jdwp-provider adbconnection &&
      adb shell start;
      Test debugger with explicit adbconnection jdwp provider set
Test: adb shell stop &&
      adb shell setprop dalvik.vm.jdwp-provider default &&
      adb shell start;
      Test debugger with explicit default jdwp provider set
      Ensure debugger is using the 'adbconnection' provider
Test: adb shell stop &&
      adb shell setprop dalvik.vm.jdwp-provider internal &&
      adb shell start;
      Test debugger with explicit internal jdwp provider set
      Ensure debugger is using the old internal jdwp implementation.

Bug: 62821960
Change-Id: I6470a90e0ca264fb75028f6e7e23878c059b090e

2 files changed, 4 insertions, 4 deletions

diff --git a/cmdline/cmdline_parser_test.cc b/cmdline/cmdline_parser_test.cc
index 5d672061df..70cc07eff0 100644
--- a/cmdline/cmdline_parser_test.cc
+++ b/cmdline/cmdline_parser_test.cc
@@ -375,7 +375,7 @@ TEST_F(CmdlineParserTest, TestJdwpProviderEmpty) {
 
 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 d0d6bfd3ce..2bc7409bb6 100644
--- a/cmdline/cmdline_types.h
+++ b/cmdline/cmdline_types.h
@@ -77,10 +77,10 @@ struct CmdlineType<JdwpProvider> : CmdlineTypeParser<JdwpProvider> {
           "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);